[portal-commits] JBoss Portal SVN: r10413 - in branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war: WEB-INF and 2 other directories.

Author: wesleyhales Date: 2008-03-28 22:15:13 -0400 (Fri, 28 Mar 2008) New Revision: 10413 Added: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/ Removed: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/ Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml Log: admin portlet migration Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-29 02:15:13 UTC (rev 10413) @@ -394,105 +394,105 @@ <navigation-rule> <navigation-case> <from-outcome>index</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>advancedMode</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>wizardMode</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>objects</from-outcome> - <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id> + <to-view-id>/jsf/objects.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPortalSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editPortalSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editPortalSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPortalTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editPortalTheme.xhtml</to-view-id> + <to-view-id>/jsf/editPortalTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageLayout</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageLayout.xhtml</to-view-id> + <to-view-id>/jsf/editPageLayout.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editPageSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editProperties</from-outcome> - <to-view-id>/WEB-INF/jsf/editProperties.xhtml</to-view-id> + <to-view-id>/jsf/editProperties.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editPageTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id> + <to-view-id>/jsf/editPageTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editWindowSecurity</from-outcome> - <to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id> + <to-view-id>/jsf/editWindowSecurity.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>renameObject</from-outcome> - <to-view-id>/WEB-INF/jsf/renameObject.xhtml</to-view-id> + <to-view-id>/jsf/renameObject.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editDisplayNames</from-outcome> - <to-view-id>/WEB-INF/jsf/displayNameObject.xhtml</to-view-id> + <to-view-id>/jsf/displayNameObject.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>editWindowTheme</from-outcome> - <to-view-id>/WEB-INF/jsf/editWindowTheme.xhtml</to-view-id> + <to-view-id>/jsf/editWindowTheme.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>instances</from-outcome> - <to-view-id>/WEB-INF/jsf/instances.xhtml</to-view-id> + <to-view-id>/jsf/instances.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>portlets</from-outcome> - <to-view-id>/WEB-INF/jsf/portlets.xhtml</to-view-id> + <to-view-id>/jsf/portlets.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPortlet</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPortal</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPortal.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPortal.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectPage</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectPage.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectPage.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>selectRegion</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/selectRegion.xhtml</to-view-id> + <to-view-id>/jsf/wizard/selectRegion.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>newWindowWizardConfirm</from-outcome> - <to-view-id>/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id> + <to-view-id>/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>dashboards</from-outcome> - <to-view-id>/WEB-INF/jsf/dashboards.xhtml</to-view-id> + <to-view-id>/jsf/dashboards.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>dashboard</from-outcome> - <to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id> + <to-view-id>/jsf/dashboard/dashboard.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirm</from-outcome> - <to-view-id>/WEB-INF/jsf/common/confirm.xhtml</to-view-id> + <to-view-id>/jsf/common/confirm.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>confirmDeleteInstance</from-outcome> - <to-view-id>/WEB-INF/jsf/confirmDeleteInstance.xhtml</to-view-id> + <to-view-id>/jsf/confirmDeleteInstance.xhtml</to-view-id> </navigation-case> </navigation-rule> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-29 02:15:13 UTC (rev 10413) @@ -34,7 +34,7 @@ <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> <name>javax.portlet.faces.defaultViewId.view</name> - <value>/WEB-INF/jsf/objects.xhtml</value> + <value>/jsf/objects.xhtml</value> </init-param> <init-param> <name>javax.portlet.faces.preserveActionParams</name> @@ -56,7 +56,7 @@ <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> <name>javax.portlet.faces.defaultViewId.view</name> - <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value> + <value>/jsf/dashboard/dashboard.xhtml</value> </init-param> <init-param> <name>javax.portlet.faces.preserveActionParams</name> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-29 02:15:13 UTC (rev 10413) @@ -35,7 +35,7 @@ <context-param> <param-name>javax.portlet.faces.renderPolicy</param-name> - <param-value>DEFAULT</param-value> + <param-value>ALWAYS_DELEGATE</param-value> </context-param> <context-param> Copied: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf (from rev 10412, branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf) Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -132,7 +132,7 @@ <tr> <td> <div class="admin-ui"> - <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> + <ui:include src="/jsf/common/editPageLayout.xhtml"> <ui:param name="pageManager" value="#{dashboard.pageManager}"/> </ui:include> </div> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> + <ui:composition template="/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Display Names"/> <ui:define name="content"> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -7,7 +7,7 @@ <ui:param name="portalObjectScreen" value="Security"/> <ui:define name="content"> <h3>Please set the page permissions</h3> - <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> </ui:define> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -3,11 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> + <ui:composition template="/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Security"/> <ui:define name="content"> <h3>Please set the portal permissions</h3> - <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> </ui:define> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -142,7 +142,7 @@ </h:form> <br/> <div class="property-container"> - <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{instancemgr.auth}"/> </ui:decorate> </div> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-03-29 01:04:13 UTC (rev 10412) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-03-29 02:15:13 UTC (rev 10413) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> + <ui:composition template="/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> <h3>Rename #{portalobjectmgr.selectedObjectType}</h3>