Author: julien(a)jboss.com Date: 2008-04-13 08:32:41 -0400 (Sun, 13 Apr 2008) New Revision: 10554 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java modules/portlet/trunk/releaseLibs.sh Log: remove the automatic export of jsr168 jar Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-13 12:24:28 UTC (rev 10553) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-04-13 12:32:41 UTC (rev 10554) @@ -36,6 +36,7 @@ import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -71,10 +72,16 @@ if (scope instanceof PortletResourceRequest.PortletScope) { PortletResourceRequest.PortletScope portletScope = (PortletResourceRequest.PortletScope)scope; - mode = portletScope.getWindowNavigationalState().getMode(); - windowState = portletScope.getWindowNavigationalState().getWindowState(); - portletNS = portletScope.getWindowNavigationalState().getPortletNavigationalState(); + WindowNavigationalState navigationalState = portletScope.getWindowNavigationalState(); + // + if (navigationalState != null) + { + mode = navigationalState.getMode(); + windowState = navigationalState.getWindowState(); + portletNS = navigationalState.getPortletNavigationalState(); + } + // if (scope instanceof PortletResourceRequest.PageScope) { Modified: modules/portlet/trunk/releaseLibs.sh =================================================================== --- modules/portlet/trunk/releaseLibs.sh 2008-04-13 12:24:28 UTC (rev 10553) +++ modules/portlet/trunk/releaseLibs.sh 2008-04-13 12:32:41 UTC (rev 10554) @@ -24,6 +24,6 @@ cp bridge/target/portlet-bridge-2.0.0-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar cp controller/target/portlet-controller-2.0.0-SNAPSHOT.jar $loc/portal-portlet-controller-lib.jar cp federation/target/portlet-federation-2.0.0-SNAPSHOT.jar $loc/portal-portlet-federation-lib.jar -cp jsr168api/target/portlet-jsr168api-2.0.0-SNAPSHOT.jar $loc/portal-portlet-jsr168api-lib.jar cp management/target/portlet-management-2.0.0-SNAPSHOT.jar $loc/portal-portlet-management-lib.jar cp portlet/target/portlet-portlet-2.0.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar +cp samples/target/portlet-samples-2.0.0-SNAPSHOT.jar $loc/portal-portlet-samples-lib.jar