JBoss Portal SVN: r12021 - in branches/JBoss_Portal_Branch_2_6: wsrp/src/main/org/jboss/portal/test/wsrp/framework and 2 other directories.
by portal-commits＠lists.jboss.org
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;
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12020 - in branches/JBoss_Portal_Branch_2_7: wsrp/src/main/org/jboss/portal/test/wsrp/framework and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-02 09:46:31 -0400 (Thu, 02 Oct 2008)
New Revision: 12020
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java
branches/JBoss_Portal_Branch_2_7/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_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 12:24:08 UTC (rev 12019)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 13:46:31 UTC (rev 12020)
@@ -53,7 +53,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;
@@ -206,7 +205,7 @@
public String addRegistrationProperty()
{
- getRegRequirements().addEmptyRegistrationProperty(PROPERTY + counter++);
+ getRegRequirements().addEmptyRegistrationProperty(PROPERTY + System.currentTimeMillis());
return PRODUCER;
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 12:24:08 UTC (rev 12019)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020)
@@ -277,11 +277,6 @@
throw new UnsupportedOperationException("getProducerConfiguration not implemented");
}
- public void setProducerConfiguration(ProducerConfiguration producerConfiguration)
- {
- throw new UnsupportedOperationException("setProducerConfiguration not implemented");
- }
-
public void usingStrictModeChangedTo(boolean strictMode)
{
WSRPValidator.setStrict(strictMode);
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 12:24:08 UTC (rev 12019)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 13:46:31 UTC (rev 12020)
@@ -39,8 +39,8 @@
* @since 2.4
*/
public interface WSRPProducer
- extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType,
- WSRP_v1_PortletManagement_PortType, ProducerConfigurationChangeListener
+ extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType,
+ WSRP_v1_PortletManagement_PortType, ProducerConfigurationChangeListener
{
/** The default session expiration time in mili seconds. */
int DEFAULT_SESSION_EXPIRATION_TIME = 300000;
@@ -109,10 +109,4 @@
* @since 2.6
*/
ProducerConfiguration getProducerConfiguration();
-
- /**
- * @param producerConfiguration
- * @since 2.6
- */
- void setProducerConfiguration(ProducerConfiguration producerConfiguration);
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 12:24:08 UTC (rev 12019)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020)
@@ -112,9 +112,6 @@
/** Handles Portlet Management interface calls. */
private PortletManagementHandler portletManagementHandler;
- /** Registration configuration service */
- private ProducerConfiguration producerConfiguration;
-
/** Registration Manager */
private RegistrationManager registrationManager;
@@ -125,6 +122,7 @@
/** Supported locales. */
private String[] supportedLocales = WSRPConstants.getDefaultLocales();
+ /** configuration service */
private ProducerConfigurationService configurationService;
public WSRPProducerImpl()
@@ -137,7 +135,7 @@
public ProducerRegistrationRequirements getProducerRegistrationRequirements()
{
- return producerConfiguration.getRegistrationRequirements();
+ return getProducerConfiguration().getRegistrationRequirements();
}
// ServiceDescription implementation ********************************************************************************
@@ -242,14 +240,9 @@
public ProducerConfiguration getProducerConfiguration()
{
- return producerConfiguration;
+ return configurationService.getConfiguration();
}
- public void setProducerConfiguration(ProducerConfiguration producerConfiguration)
- {
- this.producerConfiguration = producerConfiguration;
- }
-
public RegistrationManager getRegistrationManager()
{
return registrationManager;
@@ -274,11 +267,11 @@
{
super.startService();
- producerConfiguration = configurationService.getConfiguration();
+ ProducerConfiguration configuration = configurationService.getConfiguration();
// register to listen to changes in configuration and get initial state
- producerConfiguration.addChangeListener(this);
- usingStrictModeChangedTo(producerConfiguration.isUsingStrictMode());
+ configuration.addChangeListener(this);
+ usingStrictModeChangedTo(configuration.isUsingStrictMode());
ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements();
registrationRequirements.addRegistrationPolicyChangeListener(registrationManager);
@@ -296,7 +289,7 @@
registrationRequirements.removeRegistrationPropertyChangeListener(registrationManager);
registrationRequirements.removeRegistrationPolicyChangeListener(registrationManager);
- producerConfiguration.removeChangeListener(this);
+ getProducerConfiguration().removeChangeListener(this);
super.stopService();
}
@@ -465,7 +458,7 @@
{
Registration registration = getRegistrationFrom(registrationContext);
isRegistrationValid(registration, true);
-
+
return registration;
}
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12019 - in branches/JBoss_Portal_Branch_2_7: registration/src/main/org/jboss/portal/registration and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-02 08:24:08 -0400 (Thu, 02 Oct 2008)
New Revision: 12019
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
Log:
- Sort registration properties before displaying them, based on the natural ordering of their name.
- Added toString to RegistrationStatus for easier debugging.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-01 23:28:22 UTC (rev 12018)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-02 12:24:08 UTC (rev 12019)
@@ -35,7 +35,7 @@
import javax.faces.event.ValueChangeEvent;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -306,7 +306,7 @@
}
}
- public RegistrationInfo getExpectedRegistrationInfo()
+ private RegistrationInfo getExpectedRegistrationInfo()
{
if (expectedRegistrationInfo == null)
{
@@ -318,14 +318,21 @@
public List<RegistrationProperty> getRegistrationProperties()
{
- return new LinkedList<RegistrationProperty>(getProducerInfo().getRegistrationInfo().getRegistrationProperties().values());
+ return getSortedProperties(getProducerInfo().getRegistrationInfo());
}
public List<RegistrationProperty> getExpectedRegistrationProperties()
{
- return new ArrayList<RegistrationProperty>(getExpectedRegistrationInfo().getRegistrationProperties().values());
+ return getSortedProperties(getExpectedRegistrationInfo());
}
+ private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
+ {
+ LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
+ Collections.sort(list);
+ return list;
+ }
+
// Actions
public String update()
Modified: branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java 2008-10-01 23:28:22 UTC (rev 12018)
+++ branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java 2008-10-02 12:24:08 UTC (rev 12019)
@@ -32,16 +32,24 @@
*/
public class RegistrationStatus implements Serializable
{
+ private String humanReadable;
+
/** The registration is valid. */
- public static final RegistrationStatus VALID = new RegistrationStatus();
+ public static final RegistrationStatus VALID = new RegistrationStatus("valid");
/** The registration is waiting for validation. */
- public static final RegistrationStatus PENDING = new RegistrationStatus();
+ public static final RegistrationStatus PENDING = new RegistrationStatus("pending");
/** The registration is not valid. */
- public static final RegistrationStatus INVALID = new RegistrationStatus();
+ public static final RegistrationStatus INVALID = new RegistrationStatus("invalid");
- private RegistrationStatus()
+ private RegistrationStatus(String humanReadable)
{
+ this.humanReadable = humanReadable;
}
+
+ public String toString()
+ {
+ return "RegistrationStatus: " + humanReadable;
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-01 23:28:22 UTC (rev 12018)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-02 12:24:08 UTC (rev 12019)
@@ -32,7 +32,7 @@
* @version $Revision$
* @since 2.6
*/
-public class RegistrationProperty
+public class RegistrationProperty implements Comparable<RegistrationProperty>
{
private Long persistentId;
private RegistrationPropertyDescription persistentDescription;
@@ -44,6 +44,11 @@
private transient PropertyChangeListener listener;
private transient Status status;
+ public int compareTo(RegistrationProperty o)
+ {
+ return persistentName.compareTo(o.persistentName);
+ }
+
public enum Status
{
INEXISTENT("registration_property_status_inexistent"),
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12018 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal: wsrp/producer and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 19:28:22 -0400 (Wed, 01 Oct 2008)
New Revision: 12018
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
Log:
- JBPORTAL-2183: Properly remember the listeners when reloading a producer configuration.
Something is still not quite right with how the producer deals with configuration changes.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -35,6 +35,7 @@
import javax.xml.namespace.QName;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -227,5 +228,15 @@
{
//To change body of implemented methods use File | Settings | File Templates.
}
+
+ public Set<RegistrationPropertyChangeListener> getPropertyChangeListeners()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Set<RegistrationPolicyChangeListener> getPolicyChangeListeners()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -73,7 +73,7 @@
}
public ServiceDescription getServiceDescription(GetServiceDescription gs)
- throws InvalidRegistrationFault, OperationFailedFault, RemoteException
+ throws InvalidRegistrationFault, OperationFailedFault, RemoteException
{
WSRPExceptionFactory.throwOperationFailedFaultIfValueIsMissing(gs, "GetServiceDescription");
@@ -81,8 +81,7 @@
boolean registrationValid = producer.isRegistrationValid(registration);
ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements();
-
- PortletDescription[] offeredPortlets = null;
+ PortletDescription[] offeredPortlets;
ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.isRegistrationRequired());
serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX);
serviceDescription.setLocales(producer.getSupportedLocales());
@@ -162,7 +161,7 @@
catch (PortletInvokerException e)
{
throw WSRPExceptionFactory.throwSOAPFaultException(WSRPExceptionFactory.OPERATION_FAILED,
- "Could not retrieve portlet '" + portletContext + "'", e);
+ "Could not retrieve portlet '" + portletContext + "'", e);
}
}
@@ -200,11 +199,11 @@
{
String mimeType = (String)mimeTypes.next();
markupTypes[i] = new MarkupType(
- mimeType,
- getModeNamesFrom(capInfo.getModes(mimeType)),
- getWindowStateNamesFrom(capInfo.getWindowStates(mimeType)),
- getLocaleNamesFrom(capInfo.getLocales(mimeType)),
- null);
+ mimeType,
+ getModeNamesFrom(capInfo.getModes(mimeType)),
+ getWindowStateNamesFrom(capInfo.getWindowStates(mimeType)),
+ getLocaleNamesFrom(capInfo.getLocales(mimeType)),
+ null);
}
//todo generate a valid and better portlet handle
@@ -229,7 +228,7 @@
// keywords
// metaInfo contains comma-separated keywords: we need to extract them into an array
org.jboss.portal.wsrp.core.LocalizedString concatenatedKeywords =
- WSRPUtils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.KEYWORDS), desiredLocales);
+ WSRPUtils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.KEYWORDS), desiredLocales);
if (concatenatedKeywords != null)
{
String commaSeparatedKeywords = concatenatedKeywords.getValue();
@@ -238,7 +237,7 @@
String lang = concatenatedKeywords.getLang();
String[] keywordArray = commaSeparatedKeywords.split(",");
org.jboss.portal.wsrp.core.LocalizedString[] keywords =
- new org.jboss.portal.wsrp.core.LocalizedString[keywordArray.length];
+ new org.jboss.portal.wsrp.core.LocalizedString[keywordArray.length];
for (int i = 0; i < keywordArray.length; i++)
{
keywords[i] = WSRPTypeFactory.createLocalizedString(lang, null, keywordArray[i].trim()); // fix-me: resource name
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -23,6 +23,8 @@
package org.jboss.portal.wsrp.producer.config;
+import java.util.List;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -31,4 +33,6 @@
public interface ProducerConfiguration
{
ProducerRegistrationRequirements getRegistrationRequirements();
+
+ List<ProducerConfigurationChangeListener> getChangeListeners();
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -108,4 +109,8 @@
/** @since 2.6.3 */
void clearRegistrationPolicyChangeListeners();
+
+ Set<RegistrationPropertyChangeListener> getPropertyChangeListeners();
+
+ Set<RegistrationPolicyChangeListener> getPolicyChangeListeners();
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -45,6 +45,11 @@
return requirements;
}
+ public List<ProducerConfigurationChangeListener> getChangeListeners()
+ {
+ return listeners;
+ }
+
public void setRegistrationRequirements(ProducerRegistrationRequirements requirements)
{
this.requirements = requirements;
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -27,10 +27,14 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.portal.common.net.URLTools;
import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.registration.RegistrationPolicyChangeListener;
+import org.jboss.portal.registration.RegistrationPropertyChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;
+import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService;
+import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.ObjectModelProvider;
@@ -52,6 +56,8 @@
import java.io.Writer;
import java.net.URL;
import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -122,7 +128,7 @@
if (config.exists())
{
log.debug("Configuration saved at " + config.getCanonicalPath()
- + " is not loading properly. Falling back to default configuration.");
+ + " is not loading properly. Falling back to default configuration.");
config.delete(); // delete improper config so that we retrieve the default configuration
loadConfigurationAt(getConfigLocationURL());
}
@@ -134,7 +140,52 @@
log.debug("About to parse producer configuration " + configURL);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
ObjectModelFactory factory = new ProducerConfigurationFactory();
+
+ // save listeners if we already have a configuration
+ List<ProducerConfigurationChangeListener> listeners = null;
+ Set<RegistrationPolicyChangeListener> policyListeners = null;
+ Set<RegistrationPropertyChangeListener> propertyListeners = null;
+ ProducerRegistrationRequirements registrationRequirements;
+ if (configuration != null)
+ {
+ listeners = configuration.getChangeListeners();
+ registrationRequirements = configuration.getRegistrationRequirements();
+ if (registrationRequirements != null)
+ {
+ policyListeners = registrationRequirements.getPolicyChangeListeners();
+ propertyListeners = registrationRequirements.getPropertyChangeListeners();
+ }
+ }
+
+ // reload
configuration = (ProducerConfiguration)unmarshaller.unmarshal(configURL.openStream(), factory, null);
+
+ // restore listeners
+ if (listeners != null)
+ {
+ for (ProducerConfigurationChangeListener listener : listeners)
+ {
+ configuration.addChangeListener(listener);
+ }
+ }
+ registrationRequirements = configuration.getRegistrationRequirements();
+ if (registrationRequirements != null)
+ {
+ if (propertyListeners != null)
+ {
+ for (RegistrationPropertyChangeListener listener : propertyListeners)
+ {
+ registrationRequirements.addRegistrationPropertyChangeListener(listener);
+ }
+ }
+ if (policyListeners != null)
+ {
+ for (RegistrationPolicyChangeListener listener : policyListeners)
+ {
+ registrationRequirements.addRegistrationPolicyChangeListener(listener);
+ }
+ }
+ }
}
private URL getConfigLocationURL() throws Exception
@@ -195,7 +246,7 @@
// add schema location by declaring xsi namespace and adding xsi:schemaLocation attribute
marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
marshaller.addAttribute("xsi", "schemaLocation", "string",
- "urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd");
+ "urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd");
// create an instance of Object Model Provider
ObjectModelProvider provider = new ProducerConfigurationProvider();
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2008-10-01 23:28:22 UTC (rev 12018)
@@ -56,7 +56,7 @@
private RegistrationPolicy policy;
private String policyClassName;
private String validatorClassName;
- /** property name (QName) -> PropertyDescription */
+
private Map<QName, RegistrationPropertyDescription> registrationProperties;
private Set<RegistrationPropertyChangeListener> propertyChangeListeners = new HashSet<RegistrationPropertyChangeListener>(3);
@@ -204,6 +204,11 @@
propertyChangeListeners.remove(listener);
}
+ public Set<RegistrationPropertyChangeListener> getPropertyChangeListeners()
+ {
+ return propertyChangeListeners;
+ }
+
/*
* == RegistrationPolicyChangeListeners handling
*/
@@ -233,6 +238,10 @@
}
}
+ public Set<RegistrationPolicyChangeListener> getPolicyChangeListeners()
+ {
+ return policyChangeListeners;
+ }
public void setPolicy(RegistrationPolicy policy)
{
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12017 - in branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal: wsrp/producer and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 18:59:23 -0400 (Wed, 01 Oct 2008)
New Revision: 12017
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
Log:
- JBPORTAL-2183: Properly remember the listeners when reloading a producer configuration.
Something is still not quite right with how the producer deals with configuration changes.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -35,6 +35,7 @@
import javax.xml.namespace.QName;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -227,5 +228,15 @@
{
//To change body of implemented methods use File | Settings | File Templates.
}
+
+ public Set<RegistrationPropertyChangeListener> getPropertyChangeListeners()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Set<RegistrationPolicyChangeListener> getPolicyChangeListeners()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -82,7 +82,7 @@
RegistrationContext registrationContext = gs.getRegistrationContext();
ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements();
- PortletDescription[] offeredPortlets = null;
+ PortletDescription[] offeredPortlets;
ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.isRegistrationRequired());
serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX);
serviceDescription.setLocales(producer.getSupportedLocales());
@@ -102,7 +102,7 @@
if (registration == null && requirements.isRegistrationRequired())
{
log.debug("Unregistered consumer while registration is required. Sending registration information.");
-
+
// do not create a ModelDescription if there is no registration properties
Map info = requirements.getRegistrationProperties();
ModelDescription description = null;
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -23,6 +23,8 @@
package org.jboss.portal.wsrp.producer.config;
+import java.util.List;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -46,4 +48,6 @@
void addChangeListener(ProducerConfigurationChangeListener listener);
void removeChangeListener(ProducerConfigurationChangeListener listener);
+
+ List<ProducerConfigurationChangeListener> getChangeListeners();
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -108,4 +109,8 @@
/** @since 2.6.3 */
void clearRegistrationPolicyChangeListeners();
+
+ Set<RegistrationPropertyChangeListener> getPropertyChangeListeners();
+
+ Set<RegistrationPolicyChangeListener> getPolicyChangeListeners();
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -84,6 +84,11 @@
listeners.remove(listener);
}
+ public List<ProducerConfigurationChangeListener> getChangeListeners()
+ {
+ return listeners;
+ }
+
public void setRegistrationRequirements(ProducerRegistrationRequirements requirements)
{
this.requirements = requirements;
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -27,10 +27,14 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.portal.common.net.URLTools;
import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.registration.RegistrationPolicyChangeListener;
+import org.jboss.portal.registration.RegistrationPropertyChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;
+import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider;
import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService;
+import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.ObjectModelProvider;
@@ -52,6 +56,8 @@
import java.io.Writer;
import java.net.URL;
import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -123,7 +129,7 @@
if (config.exists())
{
log.debug("Configuration saved at " + config.getCanonicalPath()
- + " is not loading properly. Falling back to default configuration.");
+ + " is not loading properly. Falling back to default configuration.");
config.delete(); // delete improper config so that we retrieve the default configuration
loadConfigurationAt(getConfigLocationURL());
}
@@ -135,7 +141,52 @@
log.debug("About to parse producer configuration " + configURL);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
ObjectModelFactory factory = new ProducerConfigurationFactory();
+
+ // save listeners if we already have a configuration
+ List<ProducerConfigurationChangeListener> listeners = null;
+ Set<RegistrationPolicyChangeListener> policyListeners = null;
+ Set<RegistrationPropertyChangeListener> propertyListeners = null;
+ ProducerRegistrationRequirements registrationRequirements;
+ if (configuration != null)
+ {
+ listeners = configuration.getChangeListeners();
+ registrationRequirements = configuration.getRegistrationRequirements();
+ if (registrationRequirements != null)
+ {
+ policyListeners = registrationRequirements.getPolicyChangeListeners();
+ propertyListeners = registrationRequirements.getPropertyChangeListeners();
+ }
+ }
+
+ // reload
configuration = (ProducerConfiguration)unmarshaller.unmarshal(configURL.openStream(), factory, null);
+
+ // restore listeners
+ if (listeners != null)
+ {
+ for (ProducerConfigurationChangeListener listener : listeners)
+ {
+ configuration.addChangeListener(listener);
+ }
+ }
+ registrationRequirements = configuration.getRegistrationRequirements();
+ if (registrationRequirements != null)
+ {
+ if (propertyListeners != null)
+ {
+ for (RegistrationPropertyChangeListener listener : propertyListeners)
+ {
+ registrationRequirements.addRegistrationPropertyChangeListener(listener);
+ }
+ }
+ if (policyListeners != null)
+ {
+ for (RegistrationPolicyChangeListener listener : policyListeners)
+ {
+ registrationRequirements.addRegistrationPolicyChangeListener(listener);
+ }
+ }
+ }
}
private URL getConfigLocationURL() throws Exception
@@ -196,7 +247,7 @@
// add schema location by declaring xsi namespace and adding xsi:schemaLocation attribute
marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
marshaller.addAttribute("xsi", "schemaLocation", "string",
- "urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd");
+ "urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd");
// create an instance of Object Model Provider
ObjectModelProvider provider = new ProducerConfigurationProvider();
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2008-10-01 22:41:59 UTC (rev 12016)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2008-10-01 22:59:23 UTC (rev 12017)
@@ -56,7 +56,7 @@
private RegistrationPolicy policy;
private String policyClassName;
private String validatorClassName;
- /** property name (QName) -> PropertyDescription */
+
private Map<QName, RegistrationPropertyDescription> registrationProperties;
private Set<RegistrationPropertyChangeListener> propertyChangeListeners = new HashSet<RegistrationPropertyChangeListener>(3);
@@ -204,6 +204,11 @@
propertyChangeListeners.remove(listener);
}
+ public Set<RegistrationPropertyChangeListener> getPropertyChangeListeners()
+ {
+ return propertyChangeListeners;
+ }
+
/*
* == RegistrationPolicyChangeListeners handling
*/
@@ -233,6 +238,10 @@
}
}
+ public Set<RegistrationPolicyChangeListener> getPolicyChangeListeners()
+ {
+ return policyChangeListeners;
+ }
public void setPolicy(RegistrationPolicy policy)
{
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12016 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src: resources/portal-wsrp-admin-war/jsf/consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 18:41:59 -0400 (Wed, 01 Oct 2008)
New Revision: 12016
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
Log:
- Use expectedRegistrationPropertiesEmpty in editConsumer, fixed bug in implementation.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-01 19:03:41 UTC (rev 12015)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-01 22:41:59 UTC (rev 12016)
@@ -295,7 +295,15 @@
public boolean isExpectedRegistrationPropertiesEmpty()
{
- return getExpectedRegistrationInfo().isRegistrationPropertiesEmpty();
+ RegistrationInfo info = getExpectedRegistrationInfo();
+ if (info != null)
+ {
+ return info.isRegistrationPropertiesEmpty();
+ }
+ else
+ {
+ return true;
+ }
}
public RegistrationInfo getExpectedRegistrationInfo()
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01 19:03:41 UTC (rev 12015)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01 22:41:59 UTC (rev 12016)
@@ -132,7 +132,7 @@
<h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
+ <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}">
<h:dataTable id="expectedProps"
value="#{consumer.expectedRegistrationProperties}" var="prop"
rowClasses="portlet-section-body,portlet-section-alternate"
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12015 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war: jsf/consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 15:03:41 -0400 (Wed, 01 Oct 2008)
New Revision: 12015
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
- JBPORTAL-2103: fixed issue with duplicated ids.
- Improved display of registration properties a little bit using dataTable instead of forEach.
- Improved CSS.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01 15:39:38 UTC (rev 12014)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01 19:03:41 UTC (rev 12015)
@@ -82,30 +82,33 @@
<h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}">
- <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
- <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
- <th>#{i18n.edit_consumer_prop_value}</th>
- </tr>
- <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop">
- <tr title="#{prop.value.description.label.value}">
- <td>#{prop.value.name}</td>
- <td>#{prop.value.description.label.value}</td>
- <td>
- <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work -->
- <h:inputText id="prop-value-input" value="#{prop.value.value}" size="50"
- valueChangeListener="#{consumer.regPropListener}"
- disabled="#{consumer.registrationModified}"/>
- <h:outputText styleClass="portlet-msg-error" value="#{prop.value.status}"
- rendered="#{prop.value.determinedInvalid}"
- converter="faces.convert.RegistrationProperty.Status"/>
- </td>
- </tr>
- </c:forEach>
- </table>
+ <c:when test="#{consumer.registrationPropertiesEmpty}">
+ <h:dataTable id="existingProps"
+ value="#{consumer.registrationProperties}" var="prop"
+ rowClasses="portlet-section-body,portlet-section-alternate"
+ columnClasses="nameColumn,descColumn,"
+ headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}"
+ styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"
+ width="100%">
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+ #{prop.name}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+ #{prop.description.label.value}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+ <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work -->
+ <h:inputText id="prop-value-input" value="#{prop.value}" size="50"
+ valueChangeListener="#{consumer.regPropListener}"
+ disabled="#{consumer.registrationModified}"/>
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"
+ converter="faces.convert.RegistrationProperty.Status"/>
+ </h:column>
+ </h:dataTable>
<h:commandLink id="cons-update-link" action="#{consumer.update}"
value="#{i18n.edit_consumer_registration_update_props}"
rendered="#{consumer.registered}"
@@ -115,7 +118,7 @@
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}"
+ <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
rendered="#{consumer.registrationLocallyModified}"
title="#{i18n.edit_consumer_registration_modify_title}"
@@ -130,32 +133,35 @@
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
<c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}">
- <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}">
- <tr>
- <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th>
- <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
- <th>#{i18n.edit_consumer_prop_value}</th>
- </tr>
-
- <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
- <tr title="#{prop.value.description.label.value}">
- <td>#{prop.value.name}</td>
- <td>#{prop.value.description.label.value}</td>
- <td>
- <h:inputText id="prop-value-input" value="#{prop.value.value}" size="50"/>
- <h:outputText styleClass="portlet-msg-error" value="#{prop.value.status}"
- rendered="#{prop.value.determinedInvalid}"
- converter="faces.convert.RegistrationProperty.Status"/>
- </td>
- </tr>
- </c:forEach>
- </table>
+ <h:dataTable id="expectedProps"
+ value="#{consumer.expectedRegistrationProperties}" var="prop"
+ rowClasses="portlet-section-body,portlet-section-alternate"
+ columnClasses="nameColumn,descColumn,"
+ headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}"
+ styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"
+ width="100%">
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet>
+ #{prop.name}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet>
+ #{prop.description.label.value}
+ </h:column>
+ <h:column>
+ <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet>
+ <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/>
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
+ rendered="#{prop.determinedInvalid}"
+ converter="faces.convert.RegistrationProperty.Status"/>
+ </h:column>
+ </h:dataTable>
</c:when>
<c:otherwise>
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}"
+ <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-10-01 15:39:38 UTC (rev 12014)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-10-01 19:03:41 UTC (rev 12015)
@@ -17,7 +17,7 @@
/* Top nav. */
.wsrp-consumers-ui ul.topnav {
- padding: 4px 0px 3px;
+ padding: 4px 0 3px;
border-bottom: 1px solid #b3c0c7;
margin: 0;
}
@@ -25,9 +25,8 @@
.wsrp-consumers-ui ul.topnav li {
list-style-type: none;
display: inline;
- margin: 0;
+ margin: 0 0 0 5px;
padding: 3px 0.5em;
- margin-left: 5px;
border: 1px solid #b3c0c7;
border-bottom: none;
background-color: #f2f4f5;
@@ -60,14 +59,10 @@
border: solid 1px #bbb;
border-left: solid 1px #eee;
border-right: solid 1px #eee;
- background-color: #d5d5d5;
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
height: 21px;
- margin: 0px;
- padding: 0px;
- padding-left: 2px;
+ margin: 0;
+ padding: 0 0 0 2px;
}
.wsrp-consumers-ui ul.objectpath li {
@@ -105,16 +100,12 @@
color: #315896;
font-size: 11px;
padding: 3px 0 3px 3px;
- background-image: url( img/section-subHeader-bg.gif );
- background-position: left top;
- background-repeat: repeat-x;
+ background: url( img/section-subHeader-bg.gif ) repeat-x left top;
border: 1px solid #b9c6d7;
}
.wsrp-consumers-ui .portlet-section-header {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
font-weight: bold;
color: #656565;
font-size: 10px;
@@ -124,9 +115,7 @@
}
.wsrp-consumers-ui .portlet-section-header th {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
+ background: url( img/pathBackground.png ) repeat-x left;
font-weight: bold;
color: #656565;
font-size: 10px;
@@ -136,72 +125,51 @@
}
.wsrp-consumers-ui .actionConfigure {
- padding: 5px;
- background-image: url( img/jbp-icon-set/settings.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/settings.gif ) no-repeat left;
line-height: 18px;
- padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRefresh {
- padding: 5px;
- background-image: url( img/jbp-icon-set/refresh.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/refresh.gif ) no-repeat left;
line-height: 18px;
- padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRegister {
- padding: 5px;
- background-image: url( img/jbp-icon-set/register.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 24px;
+ background: url( img/jbp-icon-set/register.gif ) no-repeat left;
line-height: 18px;
- padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeregister {
- padding: 5px;
- background-image: url( img/jbp-icon-set/deregister.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 24px;
+ background: url( img/jbp-icon-set/deregister.gif ) no-repeat left;
line-height: 18px;
- padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDelete {
- padding: 5px;
- background-image: url( img/jbp-icon-set/delete2.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/delete2.gif ) no-repeat left;
line-height: 18px;
- padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionActivate {
- padding: 5px;
- background-image: url( img/jbp-icon-set/activate.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 23px;
+ background: url( img/jbp-icon-set/activate.gif ) no-repeat left;
line-height: 18px;
- padding-left: 23px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeactivate {
- padding: 5px;
- background-image: url( img/jbp-icon-set/deactivate.gif );
- background-position: left;
- background-repeat: no-repeat;
+ padding: 5px 5px 5px 20px;
+ background: url( img/jbp-icon-set/deactivate.gif ) no-repeat left;
line-height: 18px;
- padding-left: 20px;
white-space: nowrap;
}
@@ -287,25 +255,34 @@
}
.wsrp-consumers-ui .registration-prop-table.active th {
- background-color: #C7DDB7;
+ background: #C7DDB7 none;
}
-.wsrp-consumers-ui .registration-prop-table.inactive {
+.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate
+{
+ background: #dcf0d0;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive {
border: 1px solid #EBD1B8;
}
.wsrp-consumers-ui .registration-prop-table.inactive th {
- background-color: #EBD1B8;
+ background: #EBD1B8 none;
}
-.wsrp-consumers-ui .registration-prop-table th.nameColumn {
- width: 25%;
+.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate {
+ background: #f0f0dd;
}
-.wsrp-consumers-ui .registration-prop-table th.descColumn {
- width: 25%;
+.wsrp-consumers-ui .registration-prop-table .nameColumn {
+ width: 20%;
}
+.wsrp-consumers-ui .registration-prop-table .descColumn {
+ width: 20%;
+}
+
.wsrp-consumers-ui .portlet-section-buttonrow {
margin-top: 6px;
margin-bottom: 6px;
@@ -340,8 +317,7 @@
color: #fff;
font-size: 11px;
background-color: #5986b3;
- padding: 2px;
- padding-left: 4px;
+ padding: 2px 2px 2px 4px;
margin: 0;
display: block;
}
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12014 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-01 11:39:38 -0400 (Wed, 01 Oct 2008)
New Revision: 12014
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
Log:
just being consistent
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-10-01 15:39:36 UTC (rev 12013)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-10-01 15:39:38 UTC (rev 12014)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-adm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12013 - branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 11:39:36 -0400 (Wed, 01 Oct 2008)
New Revision: 12013
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
Log:
- JBPORTAL-2083: Deactivated post-load event processing in Hibernate. In essence, going back to previous
solution for Registration properties handling as more work would be needed that I'd rather not do so
close to release and it currently works well enough.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2008-10-01 15:39:15 UTC (rev 12012)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2008-10-01 15:39:36 UTC (rev 12013)
@@ -54,10 +54,5 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/consumer/domain.hbm.xml"/>
-
- <event type="post-load">
- <listener class="org.jboss.portal.wsrp.consumer.RegistrationInfoPostLoadEventListener"/>
- <listener class="org.hibernate.event.def.DefaultPostLoadEventListener"/>
- </event>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
17 years, 9 months
- 1
- 0
JBoss Portal SVN: r12012 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-10-01 11:39:15 -0400 (Wed, 01 Oct 2008)
New Revision: 12012
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
Log:
just being consistent
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-10-01 15:22:15 UTC (rev 12011)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-10-01 15:39:15 UTC (rev 12012)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-adm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
17 years, 9 months
- 1
- 0