[richfaces-svn-commits] JBoss Rich Faces SVN: r4944 - in trunk: extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context and 4 other directories.

Author: alexsmirnov Date: 2007-12-20 20:25:13 -0500 (Thu, 20 Dec 2007) New Revision: 4944 Added: trunk/samples/seamPortletEar/seamBooking/src/main/resources/META-INF/MANIFEST.MF trunk/samples/seamPortletEar/seamBookingPortlet/.xdoclet trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/META-INF/MANIFEST.MF Modified: trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/PortletRenderContextImpl.java trunk/ui/assembly/pom.xml Log: Restore Seam ConversationId parameter in the portlet. Add orderingList/shuttle scripts to assembly Modified: trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java =================================================================== --- trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java 2007-12-20 20:55:21 UTC (rev 4943) +++ trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java 2007-12-21 01:25:13 UTC (rev 4944) @@ -253,7 +253,7 @@ .evaluateExpressionGet(facesContext, "#{conversation.id}", Object.class); if(null != conversationId){ - _requestParameters.put("conversationId", new String[]{conversationId.toString()}); + _requestParameters.put(AbstractExternalContext.CONVERSATION_ID_PARAMETER, new String[]{conversationId.toString()}); } } catch (Exception e) { // Do nothing - no seam conversation found ! Modified: trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java =================================================================== --- trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java 2007-12-20 20:55:21 UTC (rev 4943) +++ trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/AbstractExternalContext.java 2007-12-21 01:25:13 UTC (rev 4944) @@ -135,6 +135,7 @@ private Object context; private boolean hasNavigationRedirect = false; + public static final String CONVERSATION_ID_PARAMETER = "conversationId"; /** * @return the hasNavigationRedirect Modified: trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/PortletRenderContextImpl.java =================================================================== --- trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/PortletRenderContextImpl.java 2007-12-20 20:55:21 UTC (rev 4943) +++ trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/PortletRenderContextImpl.java 2007-12-21 01:25:13 UTC (rev 4944) @@ -163,6 +163,10 @@ ResponseStateManager.VIEW_STATE_PARAM, viewState); } + String[] conversationId = parameters.get(CONVERSATION_ID_PARAMETER); + if(null != conversationId){ + _requestParameters.put(CONVERSATION_ID_PARAMETER, conversationId); + } } } return _requestParameters; Added: trunk/samples/seamPortletEar/seamBooking/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- trunk/samples/seamPortletEar/seamBooking/src/main/resources/META-INF/MANIFEST.MF (rev 0) +++ trunk/samples/seamPortletEar/seamBooking/src/main/resources/META-INF/MANIFEST.MF 2007-12-21 01:25:13 UTC (rev 4944) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/samples/seamPortletEar/seamBooking/src/main/resources/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/seamPortletEar/seamBookingPortlet/.xdoclet =================================================================== --- trunk/samples/seamPortletEar/seamBookingPortlet/.xdoclet (rev 0) +++ trunk/samples/seamPortletEar/seamBookingPortlet/.xdoclet 2007-12-21 01:25:13 UTC (rev 4944) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<configurations/> Added: trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/META-INF/MANIFEST.MF 2007-12-21 01:25:13 UTC (rev 4944) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/assembly/pom.xml =================================================================== --- trunk/ui/assembly/pom.xml 2007-12-20 20:55:21 UTC (rev 4943) +++ trunk/ui/assembly/pom.xml 2007-12-21 01:25:13 UTC (rev 4944) @@ -272,6 +272,27 @@ <include> ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/modalPanelBorders-min.js </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/ShuttleUtils-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/SelectItem-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/LayoutManager-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/Control-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/ListBase-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/OrderingList-min.js + </include> + <include> + ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/ListShuttle-min.js + </include> <include>**/*-min.js</include> </includes> <!-- files to exclude, path relative to output's directory -->