[portal-commits] JBoss Portal SVN: r12306 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF and 4 other directories.

Author: wesleyhales Date: 2008-11-25 20:16:34 -0500 (Tue, 25 Nov 2008) New Revision: 12306 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: JBPORTAL-2247 - removal of Richfaces configuration for portlet bridge, and dyna.js error handling Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-26 01:16:34 UTC (rev 12306) @@ -102,7 +102,9 @@ <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> - <path refid="jboss/portlet.bridge.classpath"/> + <!--<path refid="jboss/portlet.bridge.classpath"/>--> + <pathelement location="${basedir}/src/resources/portal-admin-war/WEB-INF/lib/portletbridge-api-1.0.0-SNAPSHOT.jar"/> + <pathelement location="${basedir}/src/resources/portal-admin-war/WEB-INF/lib/portletbridge-impl-1.0.0-SNAPSHOT.jar"/> </path> <!-- Configure modules --> @@ -191,11 +193,11 @@ <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> - <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> - <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> - <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> + <fileset dir="${basedir}/src/resources/portal-admin-war/WEB-INF/lib" includes="portletbridge-api-1.0.0-SNAPSHOT.jar"/> + <fileset dir="${basedir}/src/resources/portal-admin-war/WEB-INF/lib" includes="portletbridge-impl-1.0.0-SNAPSHOT.jar"/> + <fileset dir="${basedir}/src/resources/portal-admin-war/WEB-INF/lib" includes="richfaces-api-3.3.0-SNAPSHOT.jar"/> + <fileset dir="${basedir}/src/resources/portal-admin-war/WEB-INF/lib" includes="richfaces-impl-3.3.0-SNAPSHOT.jar"/> + <fileset dir="${basedir}/src/resources/portal-admin-war/WEB-INF/lib" includes="richfaces-ui-3.3.0-20081120.050956-56.jar"/> <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-11-26 01:16:34 UTC (rev 12306) @@ -35,9 +35,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> <link rel="stylesheet" type="text/css" href="/css/boxes.css"/> </header-content> @@ -57,9 +54,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-11-26 01:16:34 UTC (rev 12306) @@ -38,33 +38,6 @@ <param-value>ALWAYS_DELEGATE</param-value> </context-param> - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - - <!--When turned on, it changes ViewHandler.restoreView() to build the view before asking the StateManager for help.--> - <context-param> - <param-name>facelets.BUILD_BEFORE_RESTORE</param-name> - <param-value>true</param-value> - </context-param> - - <!-- JSF --> <context-param> @@ -78,22 +51,18 @@ </context-param> <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> <param-name>facelets.LIBRARIES</param-name> <param-value>/WEB-INF/portal.taglib.xml</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> + <!--<listener>--> + <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>--> + <!--</listener>--> <servlet> <servlet-name>FacesServlet</servlet-name> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-11-26 01:16:34 UTC (rev 12306) @@ -2,8 +2,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" xmlns:portal="http://www.jboss.org/portal"> <div class="details-container"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-11-26 01:16:34 UTC (rev 12306) @@ -8,8 +8,8 @@ <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> - <br/><br/> - <div class="float-left third-width-pad5"> + <br/> + <div class="float-left third-width"> <h:form id="display-name-form"> <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> @@ -24,7 +24,7 @@ </h:form> </div> - <div class="float-left two-third-width-pad5"> + <div class="float-right two-third-width"> <h:form id="display-name-form1"> <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-11-26 01:16:34 UTC (rev 12306) @@ -5,9 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> <script type="text/javascript"> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-11-26 01:16:34 UTC (rev 12306) @@ -29,9 +29,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> </portlet> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-11-26 01:16:34 UTC (rev 12306) @@ -28,8 +28,8 @@ version="2.4"> <context-param> - <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> - <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> </context-param> <context-param> @@ -42,26 +42,6 @@ <param-value>true</param-value> </context-param> - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>NONE</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <!--When turned on, it changes ViewHandler.restoreView() to build the view before asking the StateManager for help.--> <context-param> <param-name>facelets.BUILD_BEFORE_RESTORE</param-name> @@ -88,19 +68,6 @@ <param-value>server</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - <servlet> <servlet-name>FacesServlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js 2008-11-26 00:18:07 UTC (rev 12305) +++ branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/dyna.js 2008-11-26 01:16:34 UTC (rev 12306) @@ -313,12 +313,15 @@ // Create draggable regions for(var i = 0;i < regions_on_page.length;i++) { var region = regions_on_page[i]; - Sortable.create(region, {dropOnEmpty:true,handle:"dnd-handle",tag:"div",containment:regions_on_page,constraint:false,hoverclass:"dnd-droppable"}); + if(typeof Sortable != 'undefined'){ + Sortable.create(region, {dropOnEmpty:true,handle:"dnd-handle",tag:"div",containment:regions_on_page,constraint:false,hoverclass:"dnd-droppable"}); + } } // - Draggables.addObserver(new WindowMoveObserver()); - + if(typeof Draggables != 'undefined'){ + Draggables.addObserver(new WindowMoveObserver()); + } // snapshot();