Merge branch '2.5' of https://github.com/demoiselle/framework.git into 2.5

Luciano Borges
2 parents c7983aa5 a0af210f
Showing 3 changed files with 2 additions and 2 deletions Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/test/java/rest/BookmarkRESTTest.java
archetype/html-rest/src/main/resources/archetype-resources/src/test/resources/demoiselle.properties
archetype/html-rest/src/main/resources/archetype-resources/src/test/resources/test.properties
@@ -52,7 +52,7 @@ public class BookmarkRESTTest {
 		client = HttpClientBuilder.create().build();
 		mapper = new ObjectMapper();
  
-		Configuration config = new PropertiesConfiguration("demoiselle.properties");
+		Configuration config = new PropertiesConfiguration("test.properties");
 		url = config.getString("services.url");
 	}
  
@@ -1 +0,0 @@
-services.url=http://localhost:8080/${artifactId}/api
@@ -0,0 +1 @@
+services.url=http://localhost:8080/${artifactId}/api
...	...	@@ -52,7 +52,7 @@ public class BookmarkRESTTest {
52	52	client = HttpClientBuilder.create().build();
53	53	mapper = new ObjectMapper();
54	54
55		- Configuration config = new PropertiesConfiguration("demoiselle.properties");
	55	+ Configuration config = new PropertiesConfiguration("test.properties");
56	56	url = config.getString("services.url");
57	57	}
58	58
...	...
...	...	@@ -1 +0,0 @@
1		-services.url=http://localhost:8080/${artifactId}/api
...	...	@@ -0,0 +1 @@
	1	+services.url=http://localhost:8080/${artifactId}/api
...	...