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

Author: wesleyhales Date: 2008-07-09 14:35:06 -0400 (Wed, 09 Jul 2008) New Revision: 11380 Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/ Removed: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/ Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml Log: moved wsrp xhtml outside WEB-INF, upgrade portlet bridge to beta3 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-07-09 18:31:39 UTC (rev 11379) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-07-09 18:35:06 UTC (rev 11380) @@ -71,7 +71,7 @@ <componentref name="el" version="1.0"/> <componentref name="facelets" version="1.1.15-B1"/> <componentref name="richfaces" version="3.2.1.GA"/> - <componentref name="jboss/portlet-bridge" version="1.0.0.B2"/> + <componentref name="jboss/portlet-bridge" version="1.0.0.B3"/> <componentref name="hibernate" version="3.2.0.CR2"/> <componentref name="httpunit" version="1.6"/> <componentref name="hsqldb" version="1.8.0.2"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-07-09 18:31:39 UTC (rev 11379) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-07-09 18:35:06 UTC (rev 11380) @@ -31,6 +31,7 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> <locale-config> @@ -38,13 +39,7 @@ <supported-locale>it</supported-locale> <supported-locale>de</supported-locale> </locale-config> - </application> - <factory> - <faces-context-factory> - org.jboss.portletbridge.context.FacesContextFactoryImpl - </faces-context-factory> - </factory> <converter> <converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-07-09 18:31:39 UTC (rev 11379) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-07-09 18:35:06 UTC (rev 11380) @@ -34,6 +34,7 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> <locale-config> <default-locale>en</default-locale> <supported-locale>it</supported-locale> @@ -41,13 +42,7 @@ </locale-config> <message-bundle>conf.bundles.Identity</message-bundle> </application> - <factory> - <faces-context-factory> - org.jboss.portletbridge.context.FacesContextFactoryImpl - </faces-context-factory> - </factory> - - + <managed-bean> <managed-bean-name>configurationbean</managed-bean-name> <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-07-09 18:31:39 UTC (rev 11379) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-07-09 18:35:06 UTC (rev 11380) @@ -33,12 +33,8 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> </application> - <factory> - <faces-context-factory> - org.jboss.portletbridge.context.FacesContextFactoryImpl - </faces-context-factory> - </factory> <converter> <converter-for-class>org.jboss.portal.wsrp.registration.LocalizedString</converter-for-class> @@ -111,31 +107,31 @@ <navigation-rule> <navigation-case> <from-outcome>consumers</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/consumers.xhtml</to-view-id> + <to-view-id>/jsf/consumers/consumers.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>configureConsumer</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/editConsumer.xhtml</to-view-id> + <to-view-id>/jsf/consumers/editConsumer.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>producer</from-outcome> - <to-view-id>/WEB-INF/jsf/producer/producer.xhtml</to-view-id> + <to-view-id>/jsf/producer/producer.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirmPropDeletion</from-outcome> - <to-view-id>/WEB-INF/jsf/producer/confirmPropDeletion.xhtml</to-view-id> + <to-view-id>/jsf/producer/confirmPropDeletion.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirmEraseRegistration</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml</to-view-id> + <to-view-id>/jsf/consumers/confirmEraseRegistration.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirmDeleteConsumer</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml</to-view-id> + <to-view-id>/jsf/consumers/confirmDeleteConsumer.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>management</from-outcome> - <to-view-id>/WEB-INF/jsf/management/management.xhtml</to-view-id> + <to-view-id>/jsf/management/management.xhtml</to-view-id> </navigation-case> </navigation-rule> </faces-config> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-07-09 18:31:39 UTC (rev 11379) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-07-09 18:35:06 UTC (rev 11380) @@ -32,7 +32,7 @@ <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> <name>javax.portlet.faces.defaultViewId.view</name> - <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> + <value>/jsf/consumers/consumers.xhtml</value> </init-param> <init-param> <name>javax.portlet.faces.preserveActionParams</name> Copied: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf (from rev 11353, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf) Copied: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common (from rev 11373, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common) Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2008-07-09 16:35:12 UTC (rev 11373) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml 2008-07-09 18:35:06 UTC (rev 11380) @@ -16,7 +16,7 @@ </c:if> <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <!-- Content --> Copied: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers (from rev 11373, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers) Copied: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management (from rev 11373, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management) Copied: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer (from rev 11373, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer)