Author: chris.laprun(a)jboss.com Date: 2009-11-18 13:52:08 -0500 (Wed, 18 Nov 2009) New Revision: 653 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java Log: - Somehow missed a couple of use of WSRPUtils.existsAndIsNotEmpty methods... Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2009-11-18 18:35:56 UTC (rev 652) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2009-11-18 18:52:08 UTC (rev 653) @@ -787,27 +787,27 @@ serviceDescription.setRegistrationPropertyDescription(registrationPropertyDescription.value); serviceDescription.setRequiresInitCookie(initCookie.value); serviceDescription.setResourceList(resourceList.value); - if (WSRPUtils.existsAndIsNotEmpty(modeDescriptions.value)) + if (ParameterValidation.existsAndIsNotEmpty(modeDescriptions.value)) { serviceDescription.getCustomModeDescriptions().addAll(modeDescriptions.value); } - if (WSRPUtils.existsAndIsNotEmpty(userProfileItemDescriptions.value)) + if (ParameterValidation.existsAndIsNotEmpty(userProfileItemDescriptions.value)) { serviceDescription.getCustomUserProfileItemDescriptions().addAll(userProfileItemDescriptions.value); } - if (WSRPUtils.existsAndIsNotEmpty(windowStateDescriptions.value)) + if (ParameterValidation.existsAndIsNotEmpty(windowStateDescriptions.value)) { serviceDescription.getCustomWindowStateDescriptions().addAll(windowStateDescriptions.value); } - if (WSRPUtils.existsAndIsNotEmpty(locales.value)) + if (ParameterValidation.existsAndIsNotEmpty(locales.value)) { serviceDescription.getLocales().addAll(locales.value); } - if (WSRPUtils.existsAndIsNotEmpty(offeredPortlets.value)) + if (ParameterValidation.existsAndIsNotEmpty(offeredPortlets.value)) { serviceDescription.getOfferedPortlets().addAll(offeredPortlets.value); } - if (WSRPUtils.existsAndIsNotEmpty(userCategoryDescriptions.value)) + if (ParameterValidation.existsAndIsNotEmpty(userCategoryDescriptions.value)) { serviceDescription.getUserCategoryDescriptions().addAll(userCategoryDescriptions.value); } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2009-11-18 18:35:56 UTC (rev 652) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2009-11-18 18:52:08 UTC (rev 653) @@ -25,6 +25,7 @@ import org.gatein.common.net.media.MediaType; import org.gatein.common.util.MarkupInfo; +import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.Mode; import org.gatein.pc.api.Portlet; import org.gatein.pc.api.PortletInvokerException; @@ -405,7 +406,7 @@ public Set<WindowState> getWindowStates() { List<String> validNewWindowStates = params.getValidNewWindowStates(); - if (WSRPUtils.existsAndIsNotEmpty(validNewWindowStates)) + if (ParameterValidation.existsAndIsNotEmpty(validNewWindowStates)) { Set<WindowState> states = new HashSet<WindowState>(validNewWindowStates.size()); for (String state : validNewWindowStates) @@ -420,7 +421,7 @@ public Set<Mode> getModes() { List<String> validNewModes = params.getValidNewModes(); - if (WSRPUtils.existsAndIsNotEmpty(validNewModes)) + if (ParameterValidation.existsAndIsNotEmpty(validNewModes)) { Set<Mode> modes = new HashSet<Mode>(validNewModes.size()); for (String mode : validNewModes) @@ -455,6 +456,7 @@ } // fix-me: check that the correct semantics is used. + private SecurityContext createSecurityContext(final MarkupParams params, final RuntimeContext runtimeContext, final org.oasis.wsrp.v1.UserContext wsrpUserContext) {