[portal-commits] JBoss Portal SVN: r13687 - in jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp: endpoints and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2009-08-06 02:55:19 -0400 (Thu, 06 Aug 2009) New Revision: 13687 Added: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducer.java Removed: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/WSRPProducer.java Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ProducerHolder.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupInterface.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementInterface.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationInterface.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionInterface.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java Log: - Re-implemented end points. Wiring still needs to be done. - Moved WSRPProducer to producer package. Deleted: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/WSRPProducer.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/WSRPProducer.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/WSRPProducer.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -1,106 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.portal.wsrp; - -import org.jboss.portal.registration.RegistrationManager; -import org.jboss.portal.wsrp.producer.MarkupInterface; -import org.jboss.portal.wsrp.producer.ServiceDescriptionInterface; -import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; -import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener; -import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; -import org.oasis.wsrp.v1.CookieProtocol; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision: 12020 $ - * @since 2.4 - */ -public interface WSRPProducer extends ServiceDescriptionInterface, MarkupInterface, ProducerConfigurationChangeListener -{ - /** The default session expiration time in milliseconds. */ - int DEFAULT_SESSION_EXPIRATION_TIME = 300000; - - /** The value used to specify that a session will never expire. */ - int INFINITE_SESSION_EXPIRATION_TIME = -1; - - /** - * Indicates whether or not the Producer requires the Consumer to assist with cookie support of the HTTP protocol. - * Supported values and semantics: <ul> <li>{@link CookieProtocol#NONE}: The Producer does not need the Consumer to - * ever invoke {@link org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)}.</li> - * <li>{@link CookieProtocol#PER_USER}: The Consumer MUST invoke {@link org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)} - * once per user of the Consumer, and associate any returned cookies with subsequent invocations on behalf of that - * user.</li> <li>{@link CookieProtocol#PER_GROUP}: The Consumer MUST invoke {@link - * org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)} once per unique groupID - * from the PortletDescriptions for the Portlets it is aggregating on a page for each user of the Consumer, and - * associate any returned cookies with subsequent invocations on behalf of that user targeting Portlets with - * identical groupIDs.</li> </ul> - * - * @return the level of cookie support required from the Consumer - */ - CookieProtocol getRequiresInitCookie(); - - /** - * Sets the level of cookie support required by the Consumer. - * - * @param requiresInitCookie either {@link CookieProtocol#NONE}, {@link CookieProtocol#PER_USER} or {@link - * CookieProtocol#PER_GROUP} - */ - void setRequiresInitCookie(CookieProtocol requiresInitCookie); - - /** - * Maximum number of seconds between invocations referencing a session ID before this Producer will schedule - * releasing the related resources. {@link #INFINITE_SESSION_EXPIRATION_TIME} indicates that the sessionID will never - * expire. - * - * @return the expiration time (in seconds) of session associated resources - */ - int getSessionExpirationTime(); - - /** - * Sets the expiration time (in seconds) of session associated resources. - * - * @param sessionExpirationTime the maximum number of seconds between invocations referencing a session ID before - * this Producer will schedule releasing the related resources. If {@link - * #INFINITE_SESSION_EXPIRATION_TIME} is passed, then the session will never expire. - */ - void setSessionExpirationTime(int sessionExpirationTime); - - /** - * @return - * @since 2.6 - */ - ProducerRegistrationRequirements getProducerRegistrationRequirements(); - - /** - * @return - * @since 2.6 - */ - RegistrationManager getRegistrationManager(); - - /** - * @return - * @since 2.6 - */ - ProducerConfiguration getProducerConfiguration(); -} Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -24,8 +24,11 @@ package org.jboss.portal.wsrp.endpoints; import org.oasis.wsrp.v1.AccessDenied; +import org.oasis.wsrp.v1.BlockingInteractionResponse; import org.oasis.wsrp.v1.Extension; +import org.oasis.wsrp.v1.GetMarkup; import org.oasis.wsrp.v1.InconsistentParameters; +import org.oasis.wsrp.v1.InitCookie; import org.oasis.wsrp.v1.InteractionParams; import org.oasis.wsrp.v1.InvalidCookie; import org.oasis.wsrp.v1.InvalidHandle; @@ -34,11 +37,15 @@ import org.oasis.wsrp.v1.InvalidUserCategory; import org.oasis.wsrp.v1.MarkupContext; import org.oasis.wsrp.v1.MarkupParams; +import org.oasis.wsrp.v1.MarkupResponse; import org.oasis.wsrp.v1.MissingParameters; import org.oasis.wsrp.v1.OperationFailed; +import org.oasis.wsrp.v1.PerformBlockingInteraction; import org.oasis.wsrp.v1.PortletContext; import org.oasis.wsrp.v1.PortletStateChangeRequired; import org.oasis.wsrp.v1.RegistrationContext; +import org.oasis.wsrp.v1.ReleaseSessions; +import org.oasis.wsrp.v1.ReturnAny; import org.oasis.wsrp.v1.RuntimeContext; import org.oasis.wsrp.v1.SessionContext; import org.oasis.wsrp.v1.UnsupportedLocale; @@ -76,7 +83,20 @@ InvalidUserCategory, AccessDenied, OperationFailed { forceSessionAccess(); -// producer.performBlockingInteraction(); + + PerformBlockingInteraction performBlockingInteraction = new PerformBlockingInteraction(); + performBlockingInteraction.setPortletContext(portletContext); + performBlockingInteraction.setRuntimeContext(runtimeContext); + performBlockingInteraction.setMarkupParams(markupParams); + performBlockingInteraction.setInteractionParams(interactionParams); + performBlockingInteraction.setRegistrationContext(registrationContext); + performBlockingInteraction.setUserContext(userContext); + + BlockingInteractionResponse interactionResponse = producer.performBlockingInteraction(performBlockingInteraction); + + updateResponse.value = interactionResponse.getUpdateResponse(); + redirectURL.value = interactionResponse.getRedirectURL(); + extensions.value = interactionResponse.getExtensions(); } public List<Extension> releaseSessions( @@ -85,8 +105,14 @@ ) throws MissingParameters, InvalidRegistration, AccessDenied, OperationFailed { forceSessionAccess(); -// producer.releaseSessions(); - return null; + + ReleaseSessions releaseSessions = new ReleaseSessions(); + releaseSessions.setRegistrationContext(registrationContext); + releaseSessions.getSessionIDs().addAll(sessionIDs); + + ReturnAny returnAny = producer.releaseSessions(releaseSessions); + + return returnAny.getExtensions(); } public void getMarkup( @@ -103,7 +129,19 @@ OperationFailed { forceSessionAccess(); -// producer.getMarkup(); + + GetMarkup getMarkup = new GetMarkup(); + getMarkup.setRegistrationContext(registrationContext); + getMarkup.setPortletContext(portletContext); + getMarkup.setRuntimeContext(runtimeContext); + getMarkup.setUserContext(userContext); + getMarkup.setMarkupParams(markupParams); + + MarkupResponse response = producer.getMarkup(getMarkup); + + markupContext.value = response.getMarkupContext(); + sessionContext.value = response.getSessionContext(); + extensions.value = response.getExtensions(); } public List<Extension> initCookie( @@ -111,7 +149,12 @@ ) throws InvalidRegistration, AccessDenied, OperationFailed { forceSessionAccess(); -// producer.initCookie(); - return null; + + InitCookie initCookie = new InitCookie(); + initCookie.setRegistrationContext(registrationContext); + + ReturnAny returnAny = producer.initCookie(initCookie); + + return returnAny.getExtensions(); } } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -24,8 +24,14 @@ package org.jboss.portal.wsrp.endpoints; import org.oasis.wsrp.v1.AccessDenied; +import org.oasis.wsrp.v1.ClonePortlet; import org.oasis.wsrp.v1.DestroyFailed; +import org.oasis.wsrp.v1.DestroyPortlets; +import org.oasis.wsrp.v1.DestroyPortletsResponse; import org.oasis.wsrp.v1.Extension; +import org.oasis.wsrp.v1.GetPortletDescription; +import org.oasis.wsrp.v1.GetPortletProperties; +import org.oasis.wsrp.v1.GetPortletPropertyDescription; import org.oasis.wsrp.v1.InconsistentParameters; import org.oasis.wsrp.v1.InvalidHandle; import org.oasis.wsrp.v1.InvalidRegistration; @@ -35,11 +41,14 @@ import org.oasis.wsrp.v1.OperationFailed; import org.oasis.wsrp.v1.PortletContext; import org.oasis.wsrp.v1.PortletDescription; +import org.oasis.wsrp.v1.PortletDescriptionResponse; +import org.oasis.wsrp.v1.PortletPropertyDescriptionResponse; import org.oasis.wsrp.v1.Property; import org.oasis.wsrp.v1.PropertyList; import org.oasis.wsrp.v1.RegistrationContext; import org.oasis.wsrp.v1.ResetProperty; import org.oasis.wsrp.v1.ResourceList; +import org.oasis.wsrp.v1.SetPortletProperties; import org.oasis.wsrp.v1.UserContext; import org.oasis.wsrp.v1.WSRPV1PortletManagementPortType; @@ -61,34 +70,126 @@ @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> desiredLocales, @WebParam(mode = WebParam.Mode.OUT, name = "modelDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ModelDescription> modelDescription, @WebParam(mode = WebParam.Mode.OUT, name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ResourceList> resourceList, - @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) - throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + GetPortletPropertyDescription getPortletPropertyDescription = new GetPortletPropertyDescription(); + getPortletPropertyDescription.setRegistrationContext(registrationContext); + getPortletPropertyDescription.setPortletContext(portletContext); + getPortletPropertyDescription.setUserContext(userContext); + getPortletPropertyDescription.getDesiredLocales().addAll(desiredLocales); + + PortletPropertyDescriptionResponse descriptionResponse = producer.getPortletPropertyDescription(getPortletPropertyDescription); + + modelDescription.value = descriptionResponse.getModelDescription(); + resourceList.value = descriptionResponse.getResourceList(); + extensions.value = descriptionResponse.getExtensions(); } - public void setPortletProperties(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, @WebParam(name = "propertyList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PropertyList propertyList, @WebParam(mode = WebParam.Mode.OUT, name = "portletHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> portletHandle, @WebParam(mode = WebParam.Mode.OUT, name = "portletState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> portletState, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws MissingParameters, InconsistentP! arameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed + public void setPortletProperties( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, + @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, + @WebParam(name = "propertyList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PropertyList propertyList, + @WebParam(mode = WebParam.Mode.OUT, name = "portletHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> portletHandle, + @WebParam(mode = WebParam.Mode.OUT, name = "portletState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> portletState, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + SetPortletProperties setPortletProperties = new SetPortletProperties(); + setPortletProperties.setRegistrationContext(registrationContext); + setPortletProperties.setPortletContext(portletContext); + setPortletProperties.setUserContext(userContext); + setPortletProperties.setPropertyList(propertyList); + + PortletContext response = producer.setPortletProperties(setPortletProperties); + + portletHandle.value = response.getPortletHandle(); + portletState.value = response.getPortletState(); + extensions.value = response.getExtensions(); } - public void clonePortlet(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, @WebParam(mode = WebParam.Mode.OUT, name = "portletHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> portletHandle, @WebParam(mode = WebParam.Mode.OUT, name = "portletState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> portletState, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed + public void clonePortlet( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, + @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, + @WebParam(mode = WebParam.Mode.OUT, name = "portletHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> portletHandle, + @WebParam(mode = WebParam.Mode.OUT, name = "portletState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> portletState, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + ClonePortlet clonePortlet = new ClonePortlet(); + clonePortlet.setRegistrationContext(registrationContext); + clonePortlet.setPortletContext(portletContext); + clonePortlet.setUserContext(userContext); + + PortletContext response = producer.clonePortlet(clonePortlet); + + portletHandle.value = response.getPortletHandle(); + portletState.value = response.getPortletState(); + extensions.value = response.getExtensions(); } - public void getPortletDescription(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> desiredLocales, @WebParam(mode = WebParam.Mode.OUT, name = "portletDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<PortletDescription> portletDescription, @WebParam(mode = WebParam.Mode.OUT, name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ResourceList> resourceList, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws! MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed + public void getPortletDescription( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, + @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, + @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> desiredLocales, + @WebParam(mode = WebParam.Mode.OUT, name = "portletDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<PortletDescription> portletDescription, + @WebParam(mode = WebParam.Mode.OUT, name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ResourceList> resourceList, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + GetPortletDescription getPortletDescription = new GetPortletDescription(); + getPortletDescription.setRegistrationContext(registrationContext); + getPortletDescription.setPortletContext(portletContext); + getPortletDescription.setUserContext(userContext); + getPortletDescription.getDesiredLocales().addAll(desiredLocales); + + PortletDescriptionResponse description = producer.getPortletDescription(getPortletDescription); + + portletDescription.value = description.getPortletDescription(); + resourceList.value = description.getResourceList(); + extensions.value = description.getExtensions(); } - public void getPortletProperties(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, @WebParam(name = "names", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> names, @WebParam(mode = WebParam.Mode.OUT, name = "properties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Property>> properties, @WebParam(mode = WebParam.Mode.OUT, name = "resetProperties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ResetProperty>> resetProperties, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws MissingParameters, Incons! istentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed + public void getPortletProperties( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") PortletContext portletContext, + @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") UserContext userContext, + @WebParam(name = "names", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> names, + @WebParam(mode = WebParam.Mode.OUT, name = "properties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Property>> properties, + @WebParam(mode = WebParam.Mode.OUT, name = "resetProperties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ResetProperty>> resetProperties, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, AccessDenied, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + GetPortletProperties getPortletProperties = new GetPortletProperties(); + getPortletProperties.setRegistrationContext(registrationContext); + getPortletProperties.setPortletContext(portletContext); + getPortletProperties.setUserContext(userContext); + getPortletProperties.getNames().addAll(names); + + PropertyList result = producer.getPortletProperties(getPortletProperties); + + properties.value = result.getProperties(); + resetProperties.value = result.getResetProperties(); + extensions.value = result.getExtensions(); } - public void destroyPortlets(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "portletHandles", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> portletHandles, @WebParam(mode = WebParam.Mode.OUT, name = "destroyFailed", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<DestroyFailed>> destroyFailed, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws MissingParameters, InconsistentParameters, InvalidRegistration, OperationFailed + public void destroyPortlets( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "portletHandles", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> portletHandles, + @WebParam(mode = WebParam.Mode.OUT, name = "destroyFailed", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<DestroyFailed>> destroyFailed, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws MissingParameters, InconsistentParameters, InvalidRegistration, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + DestroyPortlets destroyPortlets = new DestroyPortlets(); + destroyPortlets.setRegistrationContext(registrationContext); + destroyPortlets.getPortletHandles().addAll(portletHandles); + + DestroyPortletsResponse destroyPortletsResponse = producer.destroyPortlets(destroyPortlets); + + destroyFailed.value = destroyPortletsResponse.getDestroyFailed(); + extensions.value = destroyPortletsResponse.getExtensions(); } } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ProducerHolder.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ProducerHolder.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ProducerHolder.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -23,7 +23,7 @@ package org.jboss.portal.wsrp.endpoints; -import org.jboss.portal.wsrp.WSRPProducer; +import org.jboss.portal.wsrp.producer.WSRPProducer; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -26,10 +26,12 @@ import org.oasis.wsrp.v1.Extension; import org.oasis.wsrp.v1.InvalidRegistration; import org.oasis.wsrp.v1.MissingParameters; +import org.oasis.wsrp.v1.ModifyRegistration; import org.oasis.wsrp.v1.OperationFailed; import org.oasis.wsrp.v1.Property; import org.oasis.wsrp.v1.RegistrationContext; import org.oasis.wsrp.v1.RegistrationData; +import org.oasis.wsrp.v1.RegistrationState; import org.oasis.wsrp.v1.WSRPV1RegistrationPortType; import javax.jws.WebParam; @@ -44,17 +46,59 @@ public class RegistrationEndpoint extends WSRPBaseEndpoint implements WSRPV1RegistrationPortType { - public void register(@WebParam(name = "consumerName", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String consumerName, @WebParam(name = "consumerAgent", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String consumerAgent, @WebParam(name = "methodGetSupported", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") boolean methodGetSupported, @WebParam(name = "consumerModes", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerModes, @WebParam(name = "consumerWindowStates", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerWindowStates, @WebParam(name = "consumerUserScopes", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerUserScopes, @WebParam(name = "customUserProfileData", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> customUserProfileData, @WebParam(name = "registrationProperties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<Property> registrat! ionProperties, @WebParam(mode = WebParam.Mode.INOUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions, @WebParam(mode = WebParam.Mode.OUT, name = "registrationHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> registrationHandle, @WebParam(mode = WebParam.Mode.OUT, name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> registrationState) throws MissingParameters, OperationFailed + public void register( + @WebParam(name = "consumerName", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String consumerName, + @WebParam(name = "consumerAgent", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String consumerAgent, + @WebParam(name = "methodGetSupported", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") boolean methodGetSupported, + @WebParam(name = "consumerModes", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerModes, + @WebParam(name = "consumerWindowStates", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerWindowStates, + @WebParam(name = "consumerUserScopes", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> consumerUserScopes, + @WebParam(name = "customUserProfileData", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> customUserProfileData, + @WebParam(name = "registrationProperties", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<Property> registrationProperties, + @WebParam(mode = WebParam.Mode.INOUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions, + @WebParam(mode = WebParam.Mode.OUT, name = "registrationHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<String> registrationHandle, + @WebParam(mode = WebParam.Mode.OUT, name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> registrationState) + throws MissingParameters, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + RegistrationData registrationData = new RegistrationData(); + registrationData.setConsumerName(consumerName); + registrationData.setConsumerAgent(consumerAgent); + registrationData.getConsumerModes().addAll(consumerModes); + registrationData.getConsumerWindowStates().addAll(consumerWindowStates); + registrationData.getConsumerUserScopes().addAll(consumerUserScopes); + registrationData.getCustomUserProfileData().addAll(customUserProfileData); + registrationData.getRegistrationProperties().addAll(registrationProperties); + registrationData.getExtensions().addAll(extensions.value); + + RegistrationContext registrationContext = producer.register(registrationData); + + registrationHandle.value = registrationContext.getRegistrationHandle(); + registrationState.value = registrationContext.getRegistrationState(); + extensions.value = registrationContext.getExtensions(); } - public void modifyRegistration(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "registrationData", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationData registrationData, @WebParam(mode = WebParam.Mode.OUT, name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> registrationState, @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws MissingParameters, InvalidRegistration, OperationFailed + public void modifyRegistration( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "registrationData", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationData registrationData, + @WebParam(mode = WebParam.Mode.OUT, name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<byte[]> registrationState, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) + throws MissingParameters, InvalidRegistration, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + ModifyRegistration modifyRegistration = new ModifyRegistration(); + modifyRegistration.setRegistrationContext(registrationContext); + modifyRegistration.setRegistrationData(registrationData); + + RegistrationState result = producer.modifyRegistration(modifyRegistration); + + registrationState.value = result.getRegistrationState(); + extensions.value = result.getExtensions(); } - public List<Extension> deregister(@WebParam(name = "registrationHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String registrationHandle, @WebParam(name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") byte[] registrationState, @WebParam(name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<Extension> extensions) throws InvalidRegistration, OperationFailed + public List<Extension> deregister( + @WebParam(name = "registrationHandle", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") String registrationHandle, + @WebParam(name = "registrationState", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") byte[] registrationState, + @WebParam(name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<Extension> extensions) + throws InvalidRegistration, OperationFailed { return null; //To change body of implemented methods use File | Settings | File Templates. } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -25,6 +25,7 @@ import org.oasis.wsrp.v1.CookieProtocol; import org.oasis.wsrp.v1.Extension; +import org.oasis.wsrp.v1.GetServiceDescription; import org.oasis.wsrp.v1.InvalidRegistration; import org.oasis.wsrp.v1.ItemDescription; import org.oasis.wsrp.v1.ModelDescription; @@ -32,6 +33,7 @@ import org.oasis.wsrp.v1.PortletDescription; import org.oasis.wsrp.v1.RegistrationContext; import org.oasis.wsrp.v1.ResourceList; +import org.oasis.wsrp.v1.ServiceDescription; import org.oasis.wsrp.v1.WSRPV1ServiceDescriptionPortType; import javax.jws.WebParam; @@ -45,8 +47,38 @@ */ public class ServiceDescriptionEndpoint extends WSRPBaseEndpoint implements WSRPV1ServiceDescriptionPortType { - public void getServiceDescription(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> desiredLocales, @WebParam(mode = WebParam.Mode.OUT, name = "requiresRegistration", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<Boolean> requiresRegistration, @WebParam(mode = WebParam.Mode.OUT, name = "offeredPortlets", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<PortletDescription>> offeredPortlets, @WebParam(mode = WebParam.Mode.OUT, name = "userCategoryDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> userCategoryDescriptions, @WebParam(mode = WebParam.Mode.OUT, name = "customUserProfileItemDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customUserProfileItemDescrip! tions, @WebParam(mode = WebParam.Mode.OUT, name = "customWindowStateDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customWindowStateDescriptions, @WebParam(mode = WebParam.Mode.OUT, name = "customModeDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customModeDescriptions, @WebParam(mode = WebParam.Mode.OUT, name = "requiresInitCookie", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<CookieProtocol> requiresInitCookie, @WebParam(mode = WebParam.Mode.OUT, name = "registrationPropertyDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ModelDescription> registrationPropertyDescription, @WebParam(mode = WebParam.Mode.OUT, name = "locales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<String>> locales, @WebParam(mode = WebParam.Mode.OUT, name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<Res! ourceList> resourceList, @WebParam(mode = WebParam.Mode.OUT, n! ame = "e xtensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions) throws InvalidRegistration, OperationFailed + public void getServiceDescription( + @WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") RegistrationContext registrationContext, + @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") List<String> desiredLocales, + @WebParam(mode = WebParam.Mode.OUT, name = "requiresRegistration", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<Boolean> requiresRegistration, + @WebParam(mode = WebParam.Mode.OUT, name = "offeredPortlets", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<PortletDescription>> offeredPortlets, + @WebParam(mode = WebParam.Mode.OUT, name = "userCategoryDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> userCategoryDescriptions, + @WebParam(mode = WebParam.Mode.OUT, name = "customUserProfileItemDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customUserProfileItemDescriptions, + @WebParam(mode = WebParam.Mode.OUT, name = "customWindowStateDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customWindowStateDescriptions, + @WebParam(mode = WebParam.Mode.OUT, name = "customModeDescriptions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<ItemDescription>> customModeDescriptions, + @WebParam(mode = WebParam.Mode.OUT, name = "requiresInitCookie", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<CookieProtocol> requiresInitCookie, + @WebParam(mode = WebParam.Mode.OUT, name = "registrationPropertyDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ModelDescription> registrationPropertyDescription, + @WebParam(mode = WebParam.Mode.OUT, name = "locales", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<String>> locales, + @WebParam(mode = WebParam.Mode.OUT, name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<ResourceList> resourceList, + @WebParam(mode = WebParam.Mode.OUT, name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v1:types") Holder<List<Extension>> extensions + ) throws InvalidRegistration, OperationFailed { - //To change body of implemented methods use File | Settings | File Templates. + GetServiceDescription getServiceDescription = new GetServiceDescription(); + getServiceDescription.setRegistrationContext(registrationContext); + getServiceDescription.getDesiredLocales().addAll(desiredLocales); + + ServiceDescription description = producer.getServiceDescription(getServiceDescription); + + requiresRegistration.value = description.isRequiresRegistration(); + offeredPortlets.value = description.getOfferedPortlets(); + userCategoryDescriptions.value = description.getUserCategoryDescriptions(); + customUserProfileItemDescriptions.value = description.getCustomUserProfileItemDescriptions(); + customWindowStateDescriptions.value = description.getCustomWindowStateDescriptions(); + customModeDescriptions.value = description.getCustomModeDescriptions(); + requiresInitCookie.value = description.getRequiresInitCookie(); + registrationPropertyDescription.value = description.getRegistrationPropertyDescription(); + locales.value = description.getLocales(); + resourceList.value = description.getResourceList(); + extensions.value = description.getExtensions(); } } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -23,7 +23,7 @@ package org.jboss.portal.wsrp.endpoints; -import org.jboss.portal.wsrp.WSRPProducer; +import org.jboss.portal.wsrp.producer.WSRPProducer; import org.jboss.portal.wsrp.servlet.ServletAccess; import javax.servlet.http.HttpSession; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -61,7 +61,6 @@ import javax.portlet.PortletModeException; import javax.portlet.WindowStateException; -import java.rmi.RemoteException; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -81,7 +80,7 @@ // Markup implementation ******************************************************************************************** - public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType, RemoteException + public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(getMarkup, GET_MARKUP); @@ -106,7 +105,7 @@ return (MarkupResponse)requestProcessor.processResponse(response); } - public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie, RemoteException + public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(performBlockingInteraction, PBI); final InteractionParams interactionParams = performBlockingInteraction.getInteractionParams(); @@ -138,14 +137,14 @@ return (BlockingInteractionResponse)requestProcessor.processResponse(response); } - public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied, RemoteException + public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied { // 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, RemoteException + public ReturnAny initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(initCookie, "InitCookie"); producer.getRegistrationOrFailIfInvalid(initCookie.getRegistrationContext()); Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupInterface.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupInterface.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupInterface.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -45,8 +45,6 @@ import org.oasis.wsrp.v1.UnsupportedMode; import org.oasis.wsrp.v1.UnsupportedWindowState; -import java.rmi.RemoteException; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -57,17 +55,17 @@ throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, - UnsupportedMimeType, RemoteException; + UnsupportedMimeType; BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, - InvalidHandle, InvalidCookie, RemoteException; + InvalidHandle, InvalidCookie; ReturnAny releaseSessions(ReleaseSessions releaseSessions) - throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied, RemoteException; + throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied; ReturnAny initCookie(InitCookie initCookie) - throws AccessDenied, OperationFailed, InvalidRegistration, RemoteException; + throws AccessDenied, OperationFailed, InvalidRegistration; } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -69,7 +69,6 @@ import org.oasis.wsrp.v1.UserContext; import org.w3c.dom.Element; -import java.rmi.RemoteException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -96,7 +95,7 @@ public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed, RemoteException + MissingParameters, InvalidRegistration, OperationFailed { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletDescription, GET_PORTLET_DESCRIPTION); Registration registration = producer.getRegistrationOrFailIfInvalid(getPortletDescription.getRegistrationContext()); @@ -114,7 +113,7 @@ public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed, RemoteException + InvalidHandle, OperationFailed { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletPropertyDescription, GET_PORTLET_PROPERTY_DESCRIPTION); @@ -160,7 +159,7 @@ } public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, OperationFailed, - InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters, RemoteException + InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(clonePortlet, "ClonePortlet"); @@ -201,7 +200,7 @@ } public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed, RemoteException + MissingParameters, InvalidRegistration, OperationFailed { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(destroyPortlets, "DestroyPortlets"); @@ -250,8 +249,7 @@ } public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration, - RemoteException + InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(setPortletProperties, "SetPortletProperties"); @@ -336,8 +334,7 @@ } public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory, - RemoteException + MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(getPortletProperties, GET_PORTLET_PROPERTIES); Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementInterface.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementInterface.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementInterface.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -42,8 +42,6 @@ import org.oasis.wsrp.v1.PropertyList; import org.oasis.wsrp.v1.SetPortletProperties; -import java.rmi.RemoteException; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -52,23 +50,21 @@ { PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, MissingParameters, - InvalidRegistration, OperationFailed, RemoteException; + InvalidRegistration, OperationFailed; PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, - OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters, RemoteException; + OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters; DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed, RemoteException; + MissingParameters, InvalidRegistration, OperationFailed; PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration, - RemoteException; + InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration; PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory, - RemoteException; + MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory; PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed, RemoteException; + InvalidHandle, OperationFailed; } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -50,7 +50,6 @@ import org.oasis.wsrp.v1.ReturnAny; import javax.xml.namespace.QName; -import java.rmi.RemoteException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -70,8 +69,7 @@ super(producer); } - public RegistrationContext register(RegistrationData registrationData) throws MissingParameters, OperationFailed, - RemoteException + public RegistrationContext register(RegistrationData registrationData) throws MissingParameters, OperationFailed { if (producer.getProducerRegistrationRequirements().isRegistrationRequired()) { @@ -146,8 +144,7 @@ capabilities.setSupportsGetMethod(registrationData.isMethodGetSupported()); } - public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration, - RemoteException + public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration { if (producer.getProducerRegistrationRequirements().isRegistrationRequired()) { @@ -186,7 +183,7 @@ } public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration, RemoteException + OperationFailed, InvalidRegistration { if (producer.getProducerRegistrationRequirements().isRegistrationRequired()) { Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationInterface.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationInterface.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RegistrationInterface.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -32,20 +32,16 @@ import org.oasis.wsrp.v1.RegistrationState; import org.oasis.wsrp.v1.ReturnAny; -import java.rmi.RemoteException; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ public interface RegistrationInterface { - RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed, - RemoteException; + RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed; - ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration, - RemoteException; + ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration; RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration, RemoteException; + OperationFailed, InvalidRegistration; } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -52,7 +52,6 @@ import org.oasis.wsrp.v1.ServiceDescription; import javax.xml.namespace.QName; -import java.rmi.RemoteException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -78,7 +77,7 @@ } public ServiceDescription getServiceDescription(GetServiceDescription gs) - throws InvalidRegistration, OperationFailed, RemoteException + throws InvalidRegistration, OperationFailed { WSRPExceptionFactory.throwOperationFailedIfValueIsMissing(gs, "GetServiceDescription"); Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionInterface.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionInterface.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionInterface.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -28,13 +28,11 @@ import org.oasis.wsrp.v1.OperationFailed; import org.oasis.wsrp.v1.ServiceDescription; -import java.rmi.RemoteException; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ public interface ServiceDescriptionInterface { - ServiceDescription getServiceDescription(GetServiceDescription gs) throws InvalidRegistration, OperationFailed, RemoteException; + ServiceDescription getServiceDescription(GetServiceDescription gs) throws InvalidRegistration, OperationFailed; } Copied: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducer.java (from rev 13681, jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/WSRPProducer.java) =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducer.java (rev 0) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducer.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -0,0 +1,105 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2009, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.portal.wsrp.producer; + +import org.jboss.portal.registration.RegistrationManager; +import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; +import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener; +import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; +import org.oasis.wsrp.v1.CookieProtocol; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 12020 $ + * @since 2.4 + */ +public interface WSRPProducer extends ServiceDescriptionInterface, MarkupInterface, PortletManagementInterface, + RegistrationInterface, ProducerConfigurationChangeListener +{ + /** The default session expiration time in milliseconds. */ + int DEFAULT_SESSION_EXPIRATION_TIME = 300000; + + /** The value used to specify that a session will never expire. */ + int INFINITE_SESSION_EXPIRATION_TIME = -1; + + /** + * Indicates whether or not the Producer requires the Consumer to assist with cookie support of the HTTP protocol. + * Supported values and semantics: <ul> <li>{@link CookieProtocol#NONE}: The Producer does not need the Consumer to + * ever invoke {@link org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)}.</li> + * <li>{@link CookieProtocol#PER_USER}: The Consumer MUST invoke {@link org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)} + * once per user of the Consumer, and associate any returned cookies with subsequent invocations on behalf of that + * user.</li> <li>{@link CookieProtocol#PER_GROUP}: The Consumer MUST invoke {@link + * org.oasis.wsrp.v1.WSRPV1MarkupPortType#initCookie(org.oasis.wsrp.v1.RegistrationContext)} once per unique groupID + * from the PortletDescriptions for the Portlets it is aggregating on a page for each user of the Consumer, and + * associate any returned cookies with subsequent invocations on behalf of that user targeting Portlets with + * identical groupIDs.</li> </ul> + * + * @return the level of cookie support required from the Consumer + */ + CookieProtocol getRequiresInitCookie(); + + /** + * Sets the level of cookie support required by the Consumer. + * + * @param requiresInitCookie either {@link CookieProtocol#NONE}, {@link CookieProtocol#PER_USER} or {@link + * CookieProtocol#PER_GROUP} + */ + void setRequiresInitCookie(CookieProtocol requiresInitCookie); + + /** + * Maximum number of seconds between invocations referencing a session ID before this Producer will schedule + * releasing the related resources. {@link #INFINITE_SESSION_EXPIRATION_TIME} indicates that the sessionID will never + * expire. + * + * @return the expiration time (in seconds) of session associated resources + */ + int getSessionExpirationTime(); + + /** + * Sets the expiration time (in seconds) of session associated resources. + * + * @param sessionExpirationTime the maximum number of seconds between invocations referencing a session ID before + * this Producer will schedule releasing the related resources. If {@link + * #INFINITE_SESSION_EXPIRATION_TIME} is passed, then the session will never expire. + */ + void setSessionExpirationTime(int sessionExpirationTime); + + /** + * @return + * @since 2.6 + */ + ProducerRegistrationRequirements getProducerRegistrationRequirements(); + + /** + * @return + * @since 2.6 + */ + RegistrationManager getRegistrationManager(); + + /** + * @return + * @since 2.6 + */ + ProducerConfiguration getProducerConfiguration(); +} Property changes on: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducer.java ___________________________________________________________________ Name: svn:executable + * Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-08-06 06:15:48 UTC (rev 13686) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-08-06 06:55:19 UTC (rev 13687) @@ -33,7 +33,6 @@ import org.jboss.portal.registration.RegistrationManager; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPExceptionFactory; -import org.jboss.portal.wsrp.WSRPProducer; import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; @@ -81,7 +80,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.rmi.RemoteException; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -93,7 +91,7 @@ * @version $Revision: 12286 $ * @since 2.4 */ -public class WSRPProducerImpl implements WSRPProducer, MarkupInterface, ServiceDescriptionInterface, RegistrationInterface, PortletManagementInterface +public class WSRPProducerImpl implements WSRPProducer { /** logger used for logging ;) */ private static final Logger log = LoggerFactory.getLogger(WSRPProducerImpl.class); @@ -142,7 +140,7 @@ // ServiceDescription implementation ******************************************************************************** public ServiceDescription getServiceDescription(GetServiceDescription gs) - throws InvalidRegistration, OperationFailed, RemoteException + throws InvalidRegistration, OperationFailed { log.debug("getServiceDescription invoked"); ServiceDescription sd = serviceDescriptionHandler.getServiceDescription(gs); @@ -153,7 +151,7 @@ // MarkupService implementation ************************************************************************************* - public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType, RemoteException + public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowState, InvalidCookie, InvalidSession, AccessDenied, InconsistentParameters, InvalidHandle, UnsupportedLocale, UnsupportedMode, OperationFailed, MissingParameters, InvalidUserCategory, InvalidRegistration, UnsupportedMimeType { log.debug("getMarkup invoked"); MarkupResponse response = markupHandler.getMarkup(getMarkup); @@ -161,7 +159,7 @@ return response; } - public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie, RemoteException + public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSession, UnsupportedMode, UnsupportedMimeType, OperationFailed, UnsupportedWindowState, UnsupportedLocale, AccessDenied, PortletStateChangeRequired, InvalidRegistration, MissingParameters, InvalidUserCategory, InconsistentParameters, InvalidHandle, InvalidCookie { log.debug("performBlockingInteraction invoked"); BlockingInteractionResponse interactionResponse = markupHandler.performBlockingInteraction(performBlockingInteraction); @@ -169,7 +167,7 @@ return interactionResponse; } - public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied, RemoteException + public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistration, OperationFailed, MissingParameters, AccessDenied { log.debug("releaseSessions invoked"); ReturnAny returnAny = markupHandler.releaseSessions(releaseSessions); @@ -177,7 +175,7 @@ return returnAny; } - public ReturnAny initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration, RemoteException + public ReturnAny initCookie(InitCookie initCookie) throws AccessDenied, OperationFailed, InvalidRegistration { log.debug("initCookie invoked"); ReturnAny returnAny = markupHandler.initCookie(initCookie); @@ -187,8 +185,7 @@ // Registration implementation ************************************************************************************** - public RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed, - RemoteException + public RegistrationContext register(RegistrationData register) throws MissingParameters, OperationFailed { log.debug("register invoked"); RegistrationContext registrationContext = registrationHandler.register(register); @@ -196,8 +193,7 @@ return registrationContext; } - public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration, - RemoteException + public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration { log.debug("deregister invoked"); ReturnAny returnAny = registrationHandler.deregister(deregister); @@ -206,7 +202,7 @@ } public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParameters, - OperationFailed, InvalidRegistration, RemoteException + OperationFailed, InvalidRegistration { log.debug("modifyRegistration invoked"); RegistrationState registrationState = registrationHandler.modifyRegistration(modifyRegistration); @@ -218,7 +214,7 @@ public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDenied, InvalidHandle, InvalidUserCategory, InconsistentParameters, MissingParameters, - InvalidRegistration, OperationFailed, RemoteException + InvalidRegistration, OperationFailed { log.debug("getPortletDescription invoked"); PortletDescriptionResponse description = portletManagementHandler.getPortletDescription(getPortletDescription); @@ -227,7 +223,7 @@ } public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategory, AccessDenied, - OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters, RemoteException + OperationFailed, InvalidHandle, InvalidRegistration, InconsistentParameters, MissingParameters { log.debug("clonePortlet invoked"); PortletContext portletContext = portletManagementHandler.clonePortlet(clonePortlet); @@ -236,7 +232,7 @@ } public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParameters, - MissingParameters, InvalidRegistration, OperationFailed, RemoteException + MissingParameters, InvalidRegistration, OperationFailed { log.debug("destroyPortlets invoked"); DestroyPortletsResponse destroyPortletsResponse = portletManagementHandler.destroyPortlets(destroyPortlets); @@ -245,8 +241,7 @@ } public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailed, - InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration, - RemoteException + InvalidHandle, MissingParameters, InconsistentParameters, InvalidUserCategory, AccessDenied, InvalidRegistration { log.debug("setPortletProperties invoked"); PortletContext portletContext = portletManagementHandler.setPortletProperties(setPortletProperties); @@ -255,8 +250,7 @@ } public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandle, - MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory, - RemoteException + MissingParameters, InvalidRegistration, AccessDenied, OperationFailed, InconsistentParameters, InvalidUserCategory { log.debug("getPortletProperties invoked"); PropertyList list = portletManagementHandler.getPortletProperties(getPortletProperties); @@ -266,7 +260,7 @@ public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParameters, InconsistentParameters, InvalidUserCategory, InvalidRegistration, AccessDenied, - InvalidHandle, OperationFailed, RemoteException + InvalidHandle, OperationFailed { log.debug("getPortletPropertyDescription invoked"); PortletPropertyDescriptionResponse descriptionResponse = portletManagementHandler.getPortletPropertyDescription(getPortletPropertyDescription);