From fb9e1f283f89aa343ae673c99583b17ef8ae458b Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Tue, 3 Jun 2014 16:07:47 -0300
Subject: [PATCH] Atualização dos links

---
 archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java | 31 +++++++++++++++----------------
 archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java     |  2 +-
 impl/core/pom.xml                                                                                 |  1 -
 parent/bom/pom.xml                                                                                |  7 -------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java b/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java
index 08aadcb..50b6e78 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/business/BookmarkBC.java
@@ -1,33 +1,32 @@
 package ${package}.business;
 
+import ${package}.entity.Bookmark;
+import ${package}.persistence.BookmarkDAO;
 import br.gov.frameworkdemoiselle.lifecycle.Startup;
 import br.gov.frameworkdemoiselle.stereotype.BusinessController;
 import br.gov.frameworkdemoiselle.template.DelegateCrud;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
 
-import ${package}.entity.Bookmark;
-import ${package}.persistence.BookmarkDAO;
-
 @BusinessController
 public class BookmarkBC extends DelegateCrud<Bookmark, Long, BookmarkDAO> {
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	@Startup
 	@Transactional
 	public void load() {
 		if (findAll().isEmpty()) {
-			insert(new Bookmark("Demoiselle Portal", "http://www.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Demoiselle SourceForge", "http://sf.net/projects/demoiselle"));
-			insert(new Bookmark("Twitter", "http://twitter.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Blog", "http://blog.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Wiki", "http://wiki.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Bug Tracking", "http://tracker.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Forum", "http://forum.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("SVN", "http://svn.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Maven", "http://repository.frameworkdemoiselle.gov.br"));
-			insert(new Bookmark("Downloads", "http://download.frameworkdemoiselle.gov.br"));
+			insert(new Bookmark("Portal", "http://www.frameworkdemoiselle.gov.br"));
+			insert(new Bookmark("Documentação", "http://demoiselle.sourceforge.net/docs/framework/reference"));
+			insert(new Bookmark("Fórum", "http://pt.stackoverflow.com/tags/demoiselle"));
+			insert(new Bookmark("Repositório", "http://github.com/demoiselle/framework"));
+			insert(new Bookmark("Bug Tracker", "https://demoiselle.atlassian.net"));
+			insert(new Bookmark("Facebook", "http://facebook.com/FrameworkDemoiselle"));
+			insert(new Bookmark("Twitter", "http://twitter.com/fwkdemoiselle"));
+			insert(new Bookmark("Blog Oficial", "http://frameworkdemoiselle.wordpress.com"));
+			insert(new Bookmark("Blog Experimental", "http://demoisellelab.wordpress.com"));
+			insert(new Bookmark("Distribuição", "http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22br.gov.frameworkdemoiselle%22"));
+			insert(new Bookmark("Binários", "http://sourceforge.net/projects/demoiselle/files/framework"));
 		}
 	}
-	
 }
diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java b/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java
index 1ec7914..e078fe2 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/java/entity/Bookmark.java
@@ -26,7 +26,7 @@ public class Bookmark implements Serializable {
 	private String description;
 
 	@NotNull
-	@Pattern(regexp = "^(https?:\\/\\/)?([\\da-z\\.-]+)\\.([a-z\\.]{2,6})([\\/\\w \\.-]*)*\\/?$", message = "{invalid.url}")
+	@Pattern(regexp = "^([a-zA-Z]+://)?(\\w+\\.\\w+)(.+)?$", message = "{invalid.url}")
 	private String link;
 
 	public Bookmark() {
diff --git a/impl/core/pom.xml b/impl/core/pom.xml
index 6fea308..2eaa784 100755
--- a/impl/core/pom.xml
+++ b/impl/core/pom.xml
@@ -189,7 +189,6 @@
 	</repositories>
 
 	<properties>
-		<demoiselle.validation.version>2.4.0-BETA2-SNAPSHOT</demoiselle.validation.version>
 		<arquillian.bom.version>1.1.1.Final</arquillian.bom.version>
 	</properties>
 </project>
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index 1b9ce29..aaf75e9 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -114,13 +114,6 @@
 				<artifactId>demoiselle-jmx</artifactId>
 				<version>2.5.0-SNAPSHOT</version>
 			</dependency>
-			<!--
-			<dependency>
-				<groupId>br.gov.frameworkdemoiselle</groupId>
-				<artifactId>demoiselle-jaas</artifactId>
-				<version>2.4.0-BETA1-SNAPSHOT</version>
-			</dependency>
-			-->
 
 			<!-- jsr-299 api -->
 			<dependency>
--
libgit2 0.21.2