Author: chris.laprun(a)jboss.com Date: 2006-12-14 21:34:28 -0500 (Thu, 14 Dec 2006) New Revision: 5867 Modified: trunk/registration/src/main/org/jboss/portal/registration/ConsumerCapabilities.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java Log: - ConsumerCapabilities now return Portal types where appropriate. - Added javadoc. Modified: trunk/registration/src/main/org/jboss/portal/registration/ConsumerCapabilities.java =================================================================== --- trunk/registration/src/main/org/jboss/portal/registration/ConsumerCapabilities.java 2006-12-15 01:19:25 UTC (rev 5866) +++ trunk/registration/src/main/org/jboss/portal/registration/ConsumerCapabilities.java 2006-12-15 02:34:28 UTC (rev 5867) @@ -34,12 +34,34 @@ { boolean supportsGetMethod(); + /** + * Returns the list of supported {@link org.jboss.portal.Mode}s + * + * @return + */ List getSupportedModes(); + /** + * Returns the list of supported {@link org.jboss.portal.WindowState}s + * + * @return + */ List getSupportedWindowStates(); + /** + * Returns the list of user scopes (e.g. "wsrp:perUser") the associated Consumer is willing to process. See WSRP 1.0 + * 7.1.1 for more details. + * + * @return + */ List getSupportedUserScopes(); + /** + * Returns the list of names of UserProfile extensions the associated Consumer supports. See WSRP 1.0 7.1.1 for more + * details. + * + * @return + */ List getSupportedUserProfileData(); void setSupportsGetMethod(boolean supportsGetMethod); Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2006-12-15 01:19:25 UTC (rev 5866) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2006-12-15 02:34:28 UTC (rev 5867) @@ -47,6 +47,7 @@ import javax.xml.namespace.QName; import java.rmi.RemoteException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -106,8 +107,29 @@ Consumer consumer = registration.getConsumer(); consumer.setConsumerAgent(registrationData.getConsumerAgent()); ConsumerCapabilities capabilities = consumer.getCapabilities(); - capabilities.setSupportedModes(getListFromArray(registrationData.getConsumerModes(), false)); - capabilities.setSupportedWindowStates(getListFromArray(registrationData.getConsumerWindowStates(), false)); + + String[] modeStrings = registrationData.getConsumerModes(); + if (modeStrings != null && modeStrings.length > 0) + { + List modes = new ArrayList(modeStrings.length); + for (int i = 0; i < modeStrings.length; i++) + { + modes.add(WSRPUtils.getJSR168PortletModeFromWSRPName(modeStrings[i])); + } + capabilities.setSupportedModes(modes); + } + + String[] wsStrings = registrationData.getConsumerWindowStates(); + if (wsStrings != null && wsStrings.length > 0) + { + List windowStates = new ArrayList(wsStrings.length); + for (int i = 0; i < wsStrings.length; i++) + { + windowStates.add(WSRPUtils.getJSR168WindowStateFromWSRPName(wsStrings[i])); + } + capabilities.setSupportedWindowStates(windowStates); + } + capabilities.setSupportedUserProfileData(getListFromArray(registrationData.getCustomUserProfileData(), false)); capabilities.setSupportedUserScopes(getListFromArray(registrationData.getConsumerUserScopes(), false)); capabilities.setSupportsGetMethod(registrationData.isMethodGetSupported());