Download as
Browse Code »

Commit e2bff0d796e8eb93b23eaccb683b488fd0b47a5f

Authored by Cleverson Sacramento
1 parent bcae1247
Exists in master

Atualização do Primefaces

Showing 6 changed files with 28 additions and 48 deletions   Show diff stats
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_edit.xhtml
  Diff comments   View file @e2bff0d
1 -<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"  
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">  
4 - 1 +<ui:composition xmlns="http://www.w3.org/1999/xhtml" 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" template="/template/main.xhtml">
5 <ui:define name="body"> 3 <ui:define name="body">
6 <h:form prependId="false"> 4 <h:form prependId="false">
7 <p:toolbar> 5 <p:toolbar>
8 <p:toolbarGroup align="left"> 6 <p:toolbarGroup align="left">
9 - <p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.insert}"  
10 - rendered="#{!bookmarkEditMB.updateMode}" ajax="false" />  
11 - <p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.update}"  
12 - rendered="#{bookmarkEditMB.updateMode}" ajax="false" />  
13 - <p:commandButton value="#{messages['button.delete']}" onclick="confirmation.show()"  
14 - rendered="#{bookmarkEditMB.updateMode}" type="button" immediate="true" ajax="false" />  
15 - <p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"  
16 - header="#{messages['label.dialog.delete']}" severity="alert" widgetVar="confirmation">  
17 - <h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkEditMB.delete}" immediate="true"  
18 - ajax="false" />  
19 - <h:commandButton value="#{messages['button.dialog.no']}" onclick="confirmation.hide()" type="button" /> 7 + <p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.insert}" rendered="#{!bookmarkEditMB.updateMode}" ajax="false" />
  8 + <p:commandButton value="#{messages['button.save']}" action="#{bookmarkEditMB.update}" rendered="#{bookmarkEditMB.updateMode}" ajax="false" />
  9 + <p:commandButton value="#{messages['button.delete']}" rendered="#{bookmarkEditMB.updateMode}" onclick="PF('confirmation').show()" type="button"
  10 + immediate="true" ajax="false" />
  11 + <p:confirmDialog message="#{messages['label.confirm.delete']}" header="#{messages['label.dialog.delete']}" showEffect="bounce"
  12 + hideEffect="explode" severity="alert" widgetVar="confirmation">
  13 + <p:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkEditMB.delete}" immediate="true" ajax="false" />
  14 + <p:commandButton value="#{messages['button.dialog.no']}" onclick="PF('confirmation').hide();" type="button" />
20 </p:confirmDialog> 15 </p:confirmDialog>
21 </p:toolbarGroup> 16 </p:toolbarGroup>
22 </p:toolbar> 17 </p:toolbar>
@@ -30,8 +25,7 @@ @@ -30,8 +25,7 @@
30 <p:message for="id" /> 25 <p:message for="id" />
31 26
32 <h:outputLabel value="#{messages['bookmark.label.description']}: " for="description" styleClass="text-input" /> 27 <h:outputLabel value="#{messages['bookmark.label.description']}: " for="description" styleClass="text-input" />
33 - <h:inputText id="description" value="#{bookmarkEditMB.bean.description}"  
34 - title="#{messages['bookmark.alt.description']}" /> 28 + <h:inputText id="description" value="#{bookmarkEditMB.bean.description}" title="#{messages['bookmark.alt.description']}" />
35 <p:message for="description" /> 29 <p:message for="description" />
36 30
37 <h:outputLabel value="#{messages['bookmark.label.link']}: " for="link" styleClass="text-input" /> 31 <h:outputLabel value="#{messages['bookmark.label.link']}: " for="link" styleClass="text-input" />
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/bookmark_list.xhtml
  Diff comments   View file @e2bff0d
1 -<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"  
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"> 1 +<ui:composition xmlns="http://www.w3.org/1999/xhtml" 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" template="/template/main.xhtml">
4 3
5 <ui:define name="body"> 4 <ui:define name="body">
6 <h:form> 5 <h:form>
@@ -9,15 +8,14 @@ @@ -9,15 +8,14 @@
9 <p:commandButton title="#{messages['button.new']}" icon="ui-icon-document" action="#{bookmarkListMB.getNextView}" 8 <p:commandButton title="#{messages['button.new']}" icon="ui-icon-document" action="#{bookmarkListMB.getNextView}"
10 actionListener="#{bookmarkListMB.clear}" ajax="false" /> 9 actionListener="#{bookmarkListMB.clear}" ajax="false" />
11 10
12 - <p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="confirmation.show()"  
13 - type="button" immediate="true" ajax="false" /> 11 + <p:commandButton title="#{messages['button.delete']}" icon="ui-icon-trash" onclick="PF('confirmation').show();" type="button" immediate="true"
  12 + ajax="false" />
14 13
15 <p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode" 14 <p:confirmDialog message="#{messages['label.confirm.delete']}" showEffect="bounce" hideEffect="explode"
16 header="#{messages['label.dialog.alert']}!" severity="alert" widgetVar="confirmation"> 15 header="#{messages['label.dialog.alert']}!" severity="alert" widgetVar="confirmation">
17 16
18 - <h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkListMB.deleteSelection}"  
19 - actionListener="#{bookmarkListMB.clear}" />  
20 - <h:commandButton value="#{messages['button.dialog.no']}" onclick="confirmation.hide()" type="button" /> 17 + <h:commandButton value="#{messages['button.dialog.yes']}" action="#{bookmarkListMB.deleteSelection}" actionListener="#{bookmarkListMB.clear}" />
  18 + <h:commandButton value="#{messages['button.dialog.no']}" onclick="PF('confirmation').hide();" type="button" />
21 </p:confirmDialog> 19 </p:confirmDialog>
22 </p:toolbarGroup> 20 </p:toolbarGroup>
23 </p:toolbar> 21 </p:toolbar>
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
  Diff comments   View file @e2bff0d
1 -<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"  
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"> 1 +<ui:composition xmlns="http://www.w3.org/1999/xhtml" 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" template="/template/main.xhtml">
4 3
5 <ui:define name="body"> 4 <ui:define name="body">
6 <p:panel> 5 <p:panel>
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/menu.xhtml
  Diff comments   View file @e2bff0d
1 -<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core"  
2 - xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"  
3 - xmlns:ui="http://java.sun.com/jsf/facelets"> 1 +<ui:composition xmlns="http://www.w3.org/1999/xhtml" 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">
4 3
5 <h:form> 4 <h:form>
6 <p:menubar> 5 <p:menubar>
@@ -9,8 +8,7 @@ @@ -9,8 +8,7 @@
9 <p:menuitem value="#{messages['menu.menuitem.list']}" url="/bookmark_list.jsf" /> 8 <p:menuitem value="#{messages['menu.menuitem.list']}" url="/bookmark_list.jsf" />
10 </p:submenu> 9 </p:submenu>
11 10
12 - <p:menuitem value="#{messages['menu.menuitem.quit']}" url="http://www.frameworkdemoiselle.gov.br/"  
13 - action="#{securityContext.logout}" /> 11 + <p:menuitem value="#{messages['menu.menuitem.quit']}" url="http://www.frameworkdemoiselle.gov.br/" action="#{securityContext.logout}" />
14 </p:menubar> 12 </p:menubar>
15 </h:form> 13 </h:form>
16 14
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/template/main.xhtml
  Diff comments   View file @e2bff0d
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"> 1 +<html xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui" xmlns:h="http://java.sun.com/jsf/html"
  2 + xmlns:ui="http://java.sun.com/jsf/facelets">
3 3
4 <f:view contentType="text/html" locale="#{locales.currentLocale}" /> 4 <f:view contentType="text/html" locale="#{locales.currentLocale}" />
5 5
@@ -11,19 +11,17 @@ @@ -11,19 +11,17 @@
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" align="left">  
15 - <a href="index.jsf"><img src="images/logo.png" border="0" /></a> 14 + <td height="70" align="left"><a href="index.jsf"><img src="images/logo.png" border="0" /></a>
16 <div style="float: right;"> 15 <div style="float: right;">
17 <h:form id="language_form" prependId="true"> 16 <h:form id="language_form" prependId="true">
18 <h:commandLink action="#{locales.setCurrentLocale('pt')}"> 17 <h:commandLink action="#{locales.setCurrentLocale('pt')}">
19 - <span class="ui-icon-locale-pt" ></span> 18 + <span class="ui-icon-locale-pt"></span>
20 </h:commandLink> 19 </h:commandLink>
21 <h:commandLink action="#{locales.setCurrentLocale('en')}"> 20 <h:commandLink action="#{locales.setCurrentLocale('en')}">
22 - <span class="ui-icon-locale-en" ></span> 21 + <span class="ui-icon-locale-en"></span>
23 </h:commandLink> 22 </h:commandLink>
24 </h:form> 23 </h:form>
25 - </div>  
26 - </td> 24 + </div></td>
27 </tr> 25 </tr>
28 <tr> 26 <tr>
29 <td height="20"><ui:include src="/menu.xhtml" /></td> 27 <td height="20"><ui:include src="/menu.xhtml" /></td>
@@ -46,6 +44,5 @@ @@ -46,6 +44,5 @@
46 <h:outputText value="" /> 44 <h:outputText value="" />
47 </f:facet> 45 </f:facet>
48 </p:ajaxStatus> 46 </p:ajaxStatus>
49 - <link type="text/css" rel="stylesheet" href="css/aristo/skin.css" />  
50 </h:body> 47 </h:body>
51 </html> 48 </html>
52 \ No newline at end of file 49 \ No newline at end of file
parent/bom/pom.xml
  Diff comments   View file @e2bff0d
@@ -198,11 +198,6 @@ @@ -198,11 +198,6 @@
198 <artifactId>jsf-impl</artifactId> 198 <artifactId>jsf-impl</artifactId>
199 <version>${jsf.version}</version> 199 <version>${jsf.version}</version>
200 </dependency> 200 </dependency>
201 - <dependency>  
202 - <groupId>org.primefaces</groupId>  
203 - <artifactId>primefaces</artifactId>  
204 - <version>${primefaces.version}</version>  
205 - </dependency>  
206 201
207 <!-- jsr-316 api --> 202 <!-- jsr-316 api -->
208 <dependency> 203 <dependency>
@@ -435,7 +430,6 @@ @@ -435,7 +430,6 @@
435 <maven.surefire.plugin.version>2.16</maven.surefire.plugin.version> 430 <maven.surefire.plugin.version>2.16</maven.surefire.plugin.version>
436 431
437 <powermock.version>1.4.6</powermock.version> 432 <powermock.version>1.4.6</powermock.version>
438 - <primefaces.version>3.5</primefaces.version>  
439 <slf4j.version>1.6.1</slf4j.version> 433 <slf4j.version>1.6.1</slf4j.version>
440 <weld.version>1.1.8.Final</weld.version> 434 <weld.version>1.1.8.Final</weld.version>
441 <commons.configuration.version>1.9</commons.configuration.version> 435 <commons.configuration.version>1.9</commons.configuration.version>