Download as
Browse Code »

Commit c1876932f1d22a783f7d769b7bc075340ddb83ef

Authored by Wilson Guimarães
1 parent 37a4099c
Exists in master

0000753: Atualização da versão do Primefaces para o Arquétipo JSF-JPA

Showing 6 changed files with 12 additions and 13 deletions   Show diff stats
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml
  Diff comments   View file @c187693
1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" 1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
2 - xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html" 2 + xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml"> 3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
4 4
5 <ui:define name="body"> 5 <ui:define name="body">
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml
  Diff comments   View file @c187693
1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" 1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
2 - xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html" 2 + xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml"> 3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
4 4
5 <ui:define name="body"> 5 <ui:define name="body">
6 <h:form> 6 <h:form>
7 <p:toolbar> 7 <p:toolbar>
8 <p:toolbarGroup align="left"> 8 <p:toolbarGroup align="left">
9 - <p:commandButton title="#{messages['button.new']}" image="ui-icon-document" action="#{bookmarkListMB.getNextView}" 9 + <p:commandButton title="#{messages['button.new']}" icon="ui-icon-document" action="#{bookmarkListMB.getNextView}"
10 actionListener="#{bookmarkListMB.clear}" ajax="false" /> 10 actionListener="#{bookmarkListMB.clear}" ajax="false" />
11 11
12 - <p:commandButton title="#{messages['button.delete']}" image="ui-icon-trash" onclick="confirmation.show()" 12 + <p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="confirmation.show()"
13 type="button" immediate="true" ajax="false" /> 13 type="button" immediate="true" ajax="false" />
14 14
15 <p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode" 15 <p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
  Diff comments   View file @c187693
1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" 1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
2 - xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html" 2 + xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml"> 3 xmlns:ui="http://java.sun.com/jsf/facelets" template="/template/main.xhtml">
4 4
5 <ui:define name="body"> 5 <ui:define name="body">
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml
  Diff comments   View file @c187693
1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" 1 <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"
2 - xmlns:p="http://primefaces.prime.com.tr/ui" xmlns:h="http://java.sun.com/jsf/html" 2 + xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
3 xmlns:ui="http://java.sun.com/jsf/facelets"> 3 xmlns:ui="http://java.sun.com/jsf/facelets">
4 4
5 <h:form> 5 <h:form>
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml
  Diff comments   View file @c187693
1 -<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.prime.com.tr/ui" 1 +<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
2 xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> 2 xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
3 3
4 <f:view contentType="text/html" locale="#{currentLocale}" /> 4 <f:view contentType="text/html" locale="#{currentLocale}" />
@@ -11,17 +11,16 @@ @@ -11,17 +11,16 @@
11 <h:body style="background-color:#f1f1f1"> 11 <h:body style="background-color:#f1f1f1">
12 <table style="width: 100%"> 12 <table style="width: 100%">
13 <tr> 13 <tr>
14 - <td height="70" width="5%" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a></td>  
15 - <td height="70" width="95%" align="left"><p:themeSwitcher initialText="Change Skin" buttonPreText="Skin: " /></td> 14 + <td height="70" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a></td>
16 </tr> 15 </tr>
17 <tr> 16 <tr>
18 - <td height="20" colspan="2"><ui:include src="/menu.xhtml" /></td> 17 + <td height="20"><ui:include src="/menu.xhtml" /></td>
19 </tr> 18 </tr>
20 <tr valign="top"> 19 <tr valign="top">
21 - <td height="400" colspan="2"><ui:insert name="body" /></td> 20 + <td height="400"><ui:insert name="body" /></td>
22 </tr> 21 </tr>
23 <tr align="center"> 22 <tr align="center">
24 - <td height="20" colspan="2" align="center" class="text-input">#{messages['main.footer.text']}</td> 23 + <td height="20" align="center" class="text-input">#{messages['main.footer.text']}</td>
25 </tr> 24 </tr>
26 </table> 25 </table>
27 26
parent/framework/pom.xml
  Diff comments   View file @c187693
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <parent> 9 <parent>
10 <groupId>br.gov.frameworkdemoiselle</groupId> 10 <groupId>br.gov.frameworkdemoiselle</groupId>
11 <artifactId>demoiselle-parent</artifactId> 11 <artifactId>demoiselle-parent</artifactId>
12 - <version>2</version> 12 + <version>3-SNAPSHOT</version>
13 <relativePath>../../../internal/parent/demoiselle/pom.xml</relativePath> 13 <relativePath>../../../internal/parent/demoiselle/pom.xml</relativePath>
14 </parent> 14 </parent>
15 15