Author: chris.laprun(a)jboss.com Date: 2008-10-02 10:21:19 -0400 (Thu, 02 Oct 2008) New Revision: 12021 Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java Log: - JBPORTAL-2183: do not keep a local copy of the configuration in producer but retrieve it from configuration service to avoid de-synchronization of state. - Changed property name generation algorithm to avoid collisions. Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 13:46:31 UTC (rev 12020) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 14:21:19 UTC (rev 12021) @@ -51,7 +51,6 @@ private String policyClassName; private String validatorClassName; private static final String PROPERTY = "property"; - private static int counter = 0; private static final String PRODUCER = "producer"; private String selectedProp; @@ -194,7 +193,7 @@ public String addRegistrationProperty() { - getRegRequirements().addEmptyRegistrationProperty(PROPERTY + counter++); + getRegRequirements().addEmptyRegistrationProperty(PROPERTY + System.currentTimeMillis()); return PRODUCER; } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 14:21:19 UTC (rev 12021) @@ -132,7 +132,7 @@ // ServiceDescription implementation ******************************************************************************** public ServiceDescription getServiceDescription(GetServiceDescription gs) - throws InvalidRegistrationFault, OperationFailedFault, RemoteException + throws InvalidRegistrationFault, OperationFailedFault, RemoteException { return getServiceDescriptionBehavior().getServiceDescription(gs); } @@ -140,35 +140,35 @@ // MarkupService implementation ************************************************************************************* public MarkupResponse getMarkup(GetMarkup getMarkup) - throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, - InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, - OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, - UnsupportedMimeTypeFault, RemoteException + throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, + InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, + OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, + UnsupportedMimeTypeFault, RemoteException { return getMarkupBehaviorFor(getMarkup.getPortletContext().getPortletHandle()) - .getMarkup(getMarkup); + .getMarkup(getMarkup); } public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) - throws InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault, - UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault, PortletStateChangeRequiredFault, - InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault, - InvalidHandleFault, InvalidCookieFault, RemoteException + throws InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault, + UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault, PortletStateChangeRequiredFault, + InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault, + InvalidHandleFault, InvalidCookieFault, RemoteException { return getMarkupBehaviorFor(performBlockingInteraction.getPortletContext().getPortletHandle()) - .performBlockingInteraction(performBlockingInteraction); + .performBlockingInteraction(performBlockingInteraction); } public ReturnAny releaseSessions(ReleaseSessions releaseSessions) - throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException + throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException { return null; } public ReturnAny initCookie(InitCookie initCookie) - throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException + throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException { // should only be called if we required cookies to be initialized if (requiresInitCookie == null || CookieProtocol.none.equals(requiresInitCookie)) @@ -206,8 +206,8 @@ // PortletManagement implementation ********************************************************************************* public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) - throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, - MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException + throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, + MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException { return getPortletManagementBehavior().getPortletDescription(getPortletDescription); } @@ -277,11 +277,6 @@ throw new UnsupportedOperationException("getProducerConfiguration not implemented"); } - public void setProducerConfiguration(ProducerConfiguration producerConfiguration) - { - throw new UnsupportedOperationException("setProducerConfiguration not implemented"); - } - public void setUseStrictMode(boolean strict) { WSRPValidator.setStrict(strict); Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 13:46:31 UTC (rev 12020) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 14:21:19 UTC (rev 12021) @@ -38,8 +38,8 @@ * @since 2.4 */ public interface WSRPProducer - extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType, - WSRP_v1_PortletManagement_PortType + extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType, + WSRP_v1_PortletManagement_PortType { /** The default session expiration time in mili seconds. */ int DEFAULT_SESSION_EXPIRATION_TIME = 300000; @@ -110,12 +110,6 @@ ProducerConfiguration getProducerConfiguration(); /** - * @param producerConfiguration - * @since 2.6 - */ - void setProducerConfiguration(ProducerConfiguration producerConfiguration); - - /** * Specifies whether conformance to WSRP specification should be strict or lenient (this can help when working with * non-complying consumers). * Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 14:21:19 UTC (rev 12021) @@ -110,9 +110,6 @@ /** Handles Portlet Management interface calls. */ private PortletManagementHandler portletManagementHandler; - /** Registration configuration service */ - private ProducerConfiguration producerConfiguration; - /** Registration Manager */ private RegistrationManager registrationManager; @@ -123,6 +120,7 @@ /** Supported locales. */ private String[] supportedLocales = WSRPConstants.getDefaultLocales(); + /** configuration service */ private ProducerConfigurationService configurationService; public WSRPProducerImpl() @@ -135,13 +133,13 @@ public ProducerRegistrationRequirements getProducerRegistrationRequirements() { - return producerConfiguration.getRegistrationRequirements(); + return getProducerConfiguration().getRegistrationRequirements(); } // ServiceDescription implementation ******************************************************************************** public ServiceDescription getServiceDescription(GetServiceDescription gs) - throws InvalidRegistrationFault, OperationFailedFault, RemoteException + throws InvalidRegistrationFault, OperationFailedFault, RemoteException { log.debug("getServiceDescription invoked"); ServiceDescription sd = serviceDescriptionHandler.getServiceDescription(gs); @@ -168,10 +166,10 @@ // MarkupService implementation ************************************************************************************* public MarkupResponse getMarkup(GetMarkup getMarkup) - throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, - InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, - OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, - UnsupportedMimeTypeFault, RemoteException + throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, + InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, + OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, + UnsupportedMimeTypeFault, RemoteException { log.debug("getMarkup invoked"); MarkupResponse response = markupHandler.getMarkup(getMarkup); @@ -180,10 +178,10 @@ } public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) - throws InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault, - UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault, PortletStateChangeRequiredFault, - InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault, - InvalidHandleFault, InvalidCookieFault, RemoteException + throws InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault, + UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault, PortletStateChangeRequiredFault, + InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault, + InvalidHandleFault, InvalidCookieFault, RemoteException { log.debug("performBlockingInteraction invoked"); BlockingInteractionResponse interactionResponse = markupHandler.performBlockingInteraction(performBlockingInteraction); @@ -192,7 +190,7 @@ } public ReturnAny releaseSessions(ReleaseSessions releaseSessions) - throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException + throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException { log.debug("releaseSessions invoked"); ReturnAny returnAny = markupHandler.releaseSessions(releaseSessions); @@ -201,7 +199,7 @@ } public ReturnAny initCookie(InitCookie initCookie) - throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException + throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException { log.debug("initCookie invoked"); ReturnAny returnAny = markupHandler.initCookie(initCookie); @@ -212,7 +210,7 @@ // Registration implementation ************************************************************************************** public RegistrationContext register(RegistrationData register) throws MissingParametersFault, OperationFailedFault, - RemoteException + RemoteException { log.debug("register invoked"); RegistrationContext registrationContext = registrationHandler.register(register); @@ -221,7 +219,7 @@ } public ReturnAny deregister(RegistrationContext deregister) throws OperationFailedFault, InvalidRegistrationFault, - RemoteException + RemoteException { log.debug("deregister invoked"); ReturnAny returnAny = registrationHandler.deregister(deregister); @@ -230,7 +228,7 @@ } public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParametersFault, - OperationFailedFault, InvalidRegistrationFault, RemoteException + OperationFailedFault, InvalidRegistrationFault, RemoteException { log.debug("modifyRegistration invoked"); RegistrationState registrationState = registrationHandler.modifyRegistration(modifyRegistration); @@ -240,14 +238,9 @@ public ProducerConfiguration getProducerConfiguration() { - return producerConfiguration; + return configurationService.getConfiguration(); } - public void setProducerConfiguration(ProducerConfiguration producerConfiguration) - { - this.producerConfiguration = producerConfiguration; - } - public RegistrationManager getRegistrationManager() { return registrationManager; @@ -277,8 +270,6 @@ { super.startService(); - producerConfiguration = configurationService.getConfiguration(); - ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements(); registrationRequirements.addRegistrationPolicyChangeListener(registrationManager); registrationRequirements.addRegistrationPropertyChangeListener(registrationManager); @@ -301,8 +292,8 @@ // PortletManagement implementation ********************************************************************************* public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) - throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, - MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException + throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, + MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException { log.debug("getPortletDescription invoked"); PortletDescriptionResponse description = portletManagementHandler.getPortletDescription(getPortletDescription); @@ -311,8 +302,8 @@ } public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategoryFault, AccessDeniedFault, - OperationFailedFault, InvalidHandleFault, InvalidRegistrationFault, InconsistentParametersFault, - MissingParametersFault, RemoteException + OperationFailedFault, InvalidHandleFault, InvalidRegistrationFault, InconsistentParametersFault, + MissingParametersFault, RemoteException { log.debug("clonePortlet invoked"); PortletContext portletContext = portletManagementHandler.clonePortlet(clonePortlet); @@ -321,7 +312,7 @@ } public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParametersFault, - MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException + MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException { log.debug("destroyPortlets invoked"); DestroyPortletsResponse destroyPortletsResponse = portletManagementHandler.destroyPortlets(destroyPortlets); @@ -330,8 +321,8 @@ } public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailedFault, - InvalidHandleFault, MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, - AccessDeniedFault, InvalidRegistrationFault, RemoteException + InvalidHandleFault, MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, + AccessDeniedFault, InvalidRegistrationFault, RemoteException { log.debug("setPortletProperties invoked"); PortletContext portletContext = portletManagementHandler.setPortletProperties(setPortletProperties); @@ -340,8 +331,8 @@ } public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandleFault, - MissingParametersFault, InvalidRegistrationFault, AccessDeniedFault, OperationFailedFault, - InconsistentParametersFault, InvalidUserCategoryFault, RemoteException + MissingParametersFault, InvalidRegistrationFault, AccessDeniedFault, OperationFailedFault, + InconsistentParametersFault, InvalidUserCategoryFault, RemoteException { log.debug("getPortletProperties invoked"); PropertyList list = portletManagementHandler.getPortletProperties(getPortletProperties); @@ -350,8 +341,8 @@ } public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) - throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, - AccessDeniedFault, InvalidHandleFault, OperationFailedFault, RemoteException + throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, + AccessDeniedFault, InvalidHandleFault, OperationFailedFault, RemoteException { log.debug("getPortletPropertyDescription invoked"); PortletPropertyDescriptionResponse descriptionResponse = portletManagementHandler.getPortletPropertyDescription(getPortletPropertyDescription); @@ -403,7 +394,7 @@ catch (NoSuchPortletException e) { throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.INVALID_HANDLE, - "Couldn't find portlet with handle '" + portletContext.getId() + "'", null); + "Couldn't find portlet with handle '" + portletContext.getId() + "'", null); } finally { @@ -413,7 +404,7 @@ if (!isRemotable(portlet)) { throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.INVALID_HANDLE, - "Portlet '" + portletContext.getId() + "' is not remotely available.", null); + "Portlet '" + portletContext.getId() + "' is not remotely available.", null); } return portlet;