Skip to content

Commit

Permalink
FACES-2178 Follow JSF 2.3 convention of having Facelet views under WE…
Browse files Browse the repository at this point in the history 
…B-INF/views and composite components under WEB-INF/resources
  • Loading branch information
@ngriffin7a
ngriffin7a committed May 6, 2015
2 parents 1ff965b + 7f535fc commit 98e69d3
Show file tree
Hide file tree
Showing 46 changed files with 28 additions and 28 deletions.
0 ...tlet/src/main/webapp/views/bookings.xhtml → .../main/webapp/WEB-INF/views/bookings.xhtml
View file
File renamed without changes.
0 ...let/src/main/webapp/views/customers.xhtml → ...main/webapp/WEB-INF/views/customers.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions demos/bridge/icefaces1-portlet/src/main/webapp/WEB-INF/faces-config.xml
View file
Expand Up @@ -55,17 +55,17 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<navigation-rule>
<from-view-id>/views/confirmation.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/confirmation.xhtml</from-view-id>
<navigation-case>
<from-outcome>submit-another-application</from-outcome>
<to-view-id>/views/portletViewMode.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/portletViewMode.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>

Expand Down
0 ...let/src/main/webapp/views/applicant.xhtml → ...main/webapp/WEB-INF/views/applicant.xhtml
View file
File renamed without changes.
0 .../src/main/webapp/views/confirmation.xhtml → ...n/webapp/WEB-INF/views/confirmation.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletEditMode.xhtml → ...ebapp/WEB-INF/views/portletEditMode.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletHelpMode.xhtml → ...ebapp/WEB-INF/views/portletHelpMode.xhtml
View file
File renamed without changes.
0 ...ain/webapp/views/portletPreferences.xhtml → ...pp/WEB-INF/views/portletPreferences.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletViewMode.xhtml → ...ebapp/WEB-INF/views/portletViewMode.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions demos/bridge/jsf1-ipc-events-bookings-portlet/src/main/webapp/WEB-INF/faces-config.xml
View file
Expand Up @@ -56,10 +56,10 @@
</managed-property>
</managed-bean>
<navigation-rule>
<from-view-id>/views/noCustomerSelected.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/noCustomerSelected.xhtml</from-view-id>
<navigation-case>
<from-outcome>ipc.customerSelected</from-outcome>
<to-view-id>/views/bookings.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/bookings.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
2 changes: 1 addition & 1 deletion demos/bridge/jsf1-ipc-events-bookings-portlet/src/main/webapp/WEB-INF/portlet.xml
View file
Expand Up @@ -9,7 +9,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/noCustomerSelected.xhtml</value>
<value>/WEB-INF/views/noCustomerSelected.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.bridgeEventHandler</name>
Expand Down
0 ...tlet/src/main/webapp/views/bookings.xhtml → .../main/webapp/WEB-INF/views/bookings.xhtml
View file
File renamed without changes.
0 ...ain/webapp/views/noCustomerSelected.xhtml → ...pp/WEB-INF/views/noCustomerSelected.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion demos/bridge/jsf1-ipc-events-customers-portlet/src/main/webapp/WEB-INF/portlet.xml
View file
Expand Up @@ -9,7 +9,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/customers.xhtml</value>
<value>/WEB-INF/views/customers.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.bridgeEventHandler</name>
Expand Down
0 ...let/src/main/webapp/views/customers.xhtml → ...main/webapp/WEB-INF/views/customers.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions demos/bridge/jsf1-ipc-pub-render-params-portlet/src/main/webapp/WEB-INF/portlet.xml
View file
Expand Up @@ -9,7 +9,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/customers.xhtml</value>
<value>/WEB-INF/views/customers.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.bridgePublicRenderParameterHandler</name>
Expand All @@ -32,7 +32,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/bookings.xhtml</value>
<value>/WEB-INF/views/bookings.xhtml</value>
</init-param>
<supports>
<mime-type>text/html</mime-type>
Expand Down
0 ...tlet/src/main/webapp/views/bookings.xhtml → .../main/webapp/WEB-INF/views/bookings.xhtml
View file
File renamed without changes.
0 ...let/src/main/webapp/views/customers.xhtml → ...main/webapp/WEB-INF/views/customers.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
0 ...tlet/src/main/webapp/views/applicant.jspx → .../main/webapp/WEB-INF/views/applicant.jspx
View file
File renamed without changes.
0 ...t/src/main/webapp/views/confirmation.jspx → ...in/webapp/WEB-INF/views/confirmation.jspx
View file
File renamed without changes.
0 ...rc/main/webapp/views/portletEditMode.jspx → ...webapp/WEB-INF/views/portletEditMode.jspx
View file
File renamed without changes.
0 ...rc/main/webapp/views/portletHelpMode.jspx → ...webapp/WEB-INF/views/portletHelpMode.jspx
View file
File renamed without changes.
0 ...main/webapp/views/portletPreferences.jspx → ...app/WEB-INF/views/portletPreferences.jspx
View file
File renamed without changes.
0 ...rc/main/webapp/views/portletViewMode.jspx → ...webapp/WEB-INF/views/portletViewMode.jspx
View file
File renamed without changes.
0 ...ortlet/src/main/webapp/views/styling.jspx → ...rc/main/webapp/WEB-INF/views/styling.jspx
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions demos/bridge/jsf1-portlet/src/main/webapp/WEB-INF/faces-config.xml
View file
Expand Up @@ -50,24 +50,24 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>edit-preferences</from-outcome>
<to-view-id>/views/portletEditMode.html?javax.portlet.faces.PortletMode=edit&amp;javax.portlet.faces.WindowState=maximized</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/views/confirmation.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/confirmation.xhtml</from-view-id>
<navigation-case>
<from-outcome>submit-another-application</from-outcome>
<to-view-id>/views/portletViewMode.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/portletViewMode.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
6 changes: 3 additions & 3 deletions demos/bridge/jsf1-portlet/src/main/webapp/WEB-INF/portlet.xml
View file
Expand Up @@ -9,15 +9,15 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/portletViewMode.xhtml</value>
<value>/WEB-INF/views/portletViewMode.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.defaultViewId.edit</name>
<value>/views/portletEditMode.xhtml</value>
<value>/WEB-INF/views/portletEditMode.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.defaultViewId.help</name>
<value>/views/portletHelpMode.xhtml</value>
<value>/WEB-INF/views/portletHelpMode.xhtml</value>
</init-param>
<supports>
<mime-type>text/html</mime-type>
Expand Down
0 ...let/src/main/webapp/views/applicant.xhtml → ...main/webapp/WEB-INF/views/applicant.xhtml
View file
File renamed without changes.
0 .../src/main/webapp/views/confirmation.xhtml → ...n/webapp/WEB-INF/views/confirmation.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletEditMode.xhtml → ...ebapp/WEB-INF/views/portletEditMode.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletHelpMode.xhtml → ...ebapp/WEB-INF/views/portletHelpMode.xhtml
View file
File renamed without changes.
0 ...ain/webapp/views/portletPreferences.xhtml → ...pp/WEB-INF/views/portletPreferences.xhtml
View file
File renamed without changes.
0 ...c/main/webapp/views/portletViewMode.xhtml → ...ebapp/WEB-INF/views/portletViewMode.xhtml
View file
File renamed without changes.
0 ...rtlet/src/main/webapp/views/styling.xhtml → ...c/main/webapp/WEB-INF/views/styling.xhtml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion issues/bridge/FACES-1478-portlet/src/main/webapp/WEB-INF/portlet.xml
View file
Expand Up @@ -7,7 +7,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/view1.xhtml</value>
<value>/WEB-INF/views/view1.xhtml</value>
</init-param>
<expiration-cache>0</expiration-cache>
<supports>
Expand Down
0 ...portlet/src/main/webapp/views/view1.xhtml → ...src/main/webapp/WEB-INF/views/view1.xhtml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion util/src/test/resources/applicant.xhtml
View file
Expand Up @@ -105,7 +105,7 @@
</h:commandButton>
<!-- Test 5.4.2 Encoding PortletMode changes in Faces navigation -->
<h:commandButton
action="/views/portletEditMode.xhtml?javax.portlet.faces.PortletMode=edit&amp;javax.portlet.faces.WindowState=maximized"
action="/WEB-INF/views/portletEditMode.xhtml?javax.portlet.faces.PortletMode=edit&amp;javax.portlet.faces.WindowState=maximized"
immediate="true" value="#{i18n['edit-preferences']}" />
</h:form>
</aui:col>
Expand Down
4 changes: 2 additions & 2 deletions util/src/test/resources/ordering/00/portlet/WEB-INF/faces-config.xml
View file
Expand Up @@ -14,10 +14,10 @@
<phase-listener>com.liferay.faces.util.lifecycle.ViewScopePhaseListener</phase-listener>
</lifecycle>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
4 changes: 2 additions & 2 deletions util/src/test/resources/ordering/04/portlet/WEB-INF/faces-config.xml
View file
Expand Up @@ -14,10 +14,10 @@
<phase-listener>com.liferay.faces.util.lifecycle.ViewScopePhaseListener</phase-listener>
</lifecycle>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
4 changes: 2 additions & 2 deletions util/src/test/resources/ordering/05/portlet/WEB-INF/faces-config.xml
View file
Expand Up @@ -14,10 +14,10 @@
<phase-listener>com.liferay.faces.util.lifecycle.ViewScopePhaseListener</phase-listener>
</lifecycle>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
4 changes: 2 additions & 2 deletions util/src/test/resources/ordering/06/portlet/WEB-INF/faces-config.xml
View file
Expand Up @@ -14,10 +14,10 @@
<phase-listener>com.liferay.faces.util.lifecycle.ViewScopePhaseListener</phase-listener>
</lifecycle>
<navigation-rule>
<from-view-id>/views/portletViewMode.xhtml</from-view-id>
<from-view-id>/WEB-INF/views/portletViewMode.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/views/confirmation.xhtml</to-view-id>
<to-view-id>/WEB-INF/views/confirmation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>

0 comments on commit 98e69d3

Please sign in to comment.