Download as
Browse Code »

Commit b181c1b4d896ec31bb20619f1d93d541875bd021

Authored by Emerson Oliveira
2 parents 4b67ff82 8b461fa2
Exists in master

Merge branch 'master' of git@github.com:demoiselle/framework.git

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/java/view/BookmarkEditMB.java
  Diff comments   View file @b181c1b
@@ -11,7 +11,7 @@ import ${package}.business.BookmarkBC; @@ -11,7 +11,7 @@ import ${package}.business.BookmarkBC;
11 import ${package}.domain.Bookmark; 11 import ${package}.domain.Bookmark;
12 12
13 @ViewController 13 @ViewController
14 -@PreviousView("/bookmark_list.xhtml") 14 +@PreviousView("./bookmark_list.xhtml")
15 public class BookmarkEditMB extends AbstractEditPageBean<Bookmark, Long> { 15 public class BookmarkEditMB extends AbstractEditPageBean<Bookmark, Long> {
16 16
17 private static final long serialVersionUID = 1L; 17 private static final long serialVersionUID = 1L;
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/java/view/BookmarkListMB.java
  Diff comments   View file @b181c1b
@@ -15,8 +15,8 @@ import ${package}.business.BookmarkBC; @@ -15,8 +15,8 @@ import ${package}.business.BookmarkBC;
15 import ${package}.domain.Bookmark; 15 import ${package}.domain.Bookmark;
16 16
17 @ViewController 17 @ViewController
18 -@NextView("/bookmark_edit.xhtml")  
19 -@PreviousView("/bookmark_list.xhtml") 18 +@NextView("./bookmark_edit.xhtml")
  19 +@PreviousView("./bookmark_list.xhtml")
20 public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> { 20 public class BookmarkListMB extends AbstractListPageBean<Bookmark, Long> {
21 21
22 private static final long serialVersionUID = 1L; 22 private static final long serialVersionUID = 1L;
parent/bom/pom.xml
  Diff comments   View file @b181c1b
@@ -338,7 +338,7 @@ @@ -338,7 +338,7 @@
338 <arquillian.junit.version>1.0.0.Alpha4.SP2</arquillian.junit.version> 338 <arquillian.junit.version>1.0.0.Alpha4.SP2</arquillian.junit.version>
339 <arquillian.weld.embdedded.version>1.0.0.Alpha2</arquillian.weld.embdedded.version> 339 <arquillian.weld.embdedded.version>1.0.0.Alpha2</arquillian.weld.embdedded.version>
340 <powermock.version>1.4.6</powermock.version> 340 <powermock.version>1.4.6</powermock.version>
341 - <primefaces.version>3.2</primefaces.version> 341 + <primefaces.version>3.4</primefaces.version>
342 <slf4j.version>1.6.1</slf4j.version> 342 <slf4j.version>1.6.1</slf4j.version>
343 <weld.version>1.1.8.Final</weld.version> 343 <weld.version>1.1.8.Final</weld.version>
344 <commons.configuration.version>1.5</commons.configuration.version> 344 <commons.configuration.version>1.5</commons.configuration.version>