Commit fb9e1f283f89aa343ae673c99583b17ef8ae458b

Authored by Cleverson Sacramento
1 parent ff4d5eed
Exists in master

Atualização dos links

archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java
1 package ${package}.business; 1 package ${package}.business;
2 2
  3 +import ${package}.entity.Bookmark;
  4 +import ${package}.persistence.BookmarkDAO;
3 import br.gov.frameworkdemoiselle.lifecycle.Startup; 5 import br.gov.frameworkdemoiselle.lifecycle.Startup;
4 import br.gov.frameworkdemoiselle.stereotype.BusinessController; 6 import br.gov.frameworkdemoiselle.stereotype.BusinessController;
5 import br.gov.frameworkdemoiselle.template.DelegateCrud; 7 import br.gov.frameworkdemoiselle.template.DelegateCrud;
6 import br.gov.frameworkdemoiselle.transaction.Transactional; 8 import br.gov.frameworkdemoiselle.transaction.Transactional;
7 9
8 -import ${package}.entity.Bookmark;  
9 -import ${package}.persistence.BookmarkDAO;  
10 -  
11 @BusinessController 10 @BusinessController
12 public class BookmarkBC extends DelegateCrud<Bookmark, Long, BookmarkDAO> { 11 public class BookmarkBC extends DelegateCrud<Bookmark, Long, BookmarkDAO> {
13 - 12 +
14 private static final long serialVersionUID = 1L; 13 private static final long serialVersionUID = 1L;
15 - 14 +
16 @Startup 15 @Startup
17 @Transactional 16 @Transactional
18 public void load() { 17 public void load() {
19 if (findAll().isEmpty()) { 18 if (findAll().isEmpty()) {
20 - insert(new Bookmark("Demoiselle Portal", "http://www.frameworkdemoiselle.gov.br"));  
21 - insert(new Bookmark("Demoiselle SourceForge", "http://sf.net/projects/demoiselle"));  
22 - insert(new Bookmark("Twitter", "http://twitter.frameworkdemoiselle.gov.br"));  
23 - insert(new Bookmark("Blog", "http://blog.frameworkdemoiselle.gov.br"));  
24 - insert(new Bookmark("Wiki", "http://wiki.frameworkdemoiselle.gov.br"));  
25 - insert(new Bookmark("Bug Tracking", "http://tracker.frameworkdemoiselle.gov.br"));  
26 - insert(new Bookmark("Forum", "http://forum.frameworkdemoiselle.gov.br"));  
27 - insert(new Bookmark("SVN", "http://svn.frameworkdemoiselle.gov.br"));  
28 - insert(new Bookmark("Maven", "http://repository.frameworkdemoiselle.gov.br"));  
29 - insert(new Bookmark("Downloads", "http://download.frameworkdemoiselle.gov.br")); 19 + insert(new Bookmark("Portal", "http://www.frameworkdemoiselle.gov.br"));
  20 + insert(new Bookmark("Documentação", "http://demoiselle.sourceforge.net/docs/framework/reference"));
  21 + insert(new Bookmark("Fórum", "http://pt.stackoverflow.com/tags/demoiselle"));
  22 + insert(new Bookmark("Repositório", "http://github.com/demoiselle/framework"));
  23 + insert(new Bookmark("Bug Tracker", "https://demoiselle.atlassian.net"));
  24 + insert(new Bookmark("Facebook", "http://facebook.com/FrameworkDemoiselle"));
  25 + insert(new Bookmark("Twitter", "http://twitter.com/fwkdemoiselle"));
  26 + insert(new Bookmark("Blog Oficial", "http://frameworkdemoiselle.wordpress.com"));
  27 + insert(new Bookmark("Blog Experimental", "http://demoisellelab.wordpress.com"));
  28 + insert(new Bookmark("Distribuição", "http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22br.gov.frameworkdemoiselle%22"));
  29 + insert(new Bookmark("Binários", "http://sourceforge.net/projects/demoiselle/files/framework"));
30 } 30 }
31 } 31 }
32 -  
33 } 32 }
archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java
@@ -26,7 +26,7 @@ public class Bookmark implements Serializable { @@ -26,7 +26,7 @@ public class Bookmark implements Serializable {
26 private String description; 26 private String description;
27 27
28 @NotNull 28 @NotNull
29 - @Pattern(regexp = "^(https?:\\/\\/)?([\\da-z\\.-]+)\\.([a-z\\.]{2,6})([\\/\\w \\.-]*)*\\/?$", message = "{invalid.url}") 29 + @Pattern(regexp = "^([a-zA-Z]+://)?(\\w+\\.\\w+)(.+)?$", message = "{invalid.url}")
30 private String link; 30 private String link;
31 31
32 public Bookmark() { 32 public Bookmark() {
impl/core/pom.xml
@@ -189,7 +189,6 @@ @@ -189,7 +189,6 @@
189 </repositories> 189 </repositories>
190 190
191 <properties> 191 <properties>
192 - <demoiselle.validation.version>2.4.0-BETA2-SNAPSHOT</demoiselle.validation.version>  
193 <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> 192 <arquillian.bom.version>1.1.1.Final</arquillian.bom.version>
194 </properties> 193 </properties>
195 </project> 194 </project>
parent/bom/pom.xml
@@ -114,13 +114,6 @@ @@ -114,13 +114,6 @@
114 <artifactId>demoiselle-jmx</artifactId> 114 <artifactId>demoiselle-jmx</artifactId>
115 <version>2.5.0-SNAPSHOT</version> 115 <version>2.5.0-SNAPSHOT</version>
116 </dependency> 116 </dependency>
117 - <!--  
118 - <dependency>  
119 - <groupId>br.gov.frameworkdemoiselle</groupId>  
120 - <artifactId>demoiselle-jaas</artifactId>  
121 - <version>2.4.0-BETA1-SNAPSHOT</version>  
122 - </dependency>  
123 - -->  
124 117
125 <!-- jsr-299 api --> 118 <!-- jsr-299 api -->
126 <dependency> 119 <dependency>