Merge branch '3.0.0-SNAPSHOT' of https://github.com/demoiselle/framework into 3.0.0-SNAPSHOT

PauloGladson
2 parents 586f311d 4f76469a
Showing 10 changed files with 24 additions and 26 deletions Show diff stats
.gitignore
core/pom.xml
core/src/main/java/org/demoiselle/jee/core/internal/producer/ResourceBundleProducer.java
core/src/main/java/org/demoiselle/jee/core/util/CDIUtils.java
core/src/main/java/org/demoiselle/jee/core/util/Exceptions.java
core/src/main/java/org/demoiselle/jee/core/util/Reflections.java
core/src/main/java/org/demoiselle/jee/core/util/Strings.java
persistence/pom.xml
security/pom.xml
ws/pom.xml
 /persistence/target/
 /core/target/
 /ws/target/
-/security/target/
 \ No newline at end of file
+/security/target/
+/.project
+/.settings/
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.demoiselle.jee</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>demoiselle-core</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
@@ -7,14 +7,16 @@ package org.demoiselle.jee.core.internal.producer;
  
 import java.io.Serializable;
 import java.util.Locale;
-import org.demoiselle.jee.core.util.ResourceBundle;
+
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.CDI;
 import javax.enterprise.inject.spi.InjectionPoint;
+
 import org.demoiselle.jee.core.annotation.Name;
-import org.demoiselle.util.CDIUtils;
+import org.demoiselle.jee.core.util.CDIUtils;
+import org.demoiselle.jee.core.util.ResourceBundle;
  
 /**
  *
@@ -53,7 +55,8 @@ public class ResourceBundleProducer implements Serializable {
         return create(baseName);
     }
  
-    public static ResourceBundle create(String baseName) {
+	@SuppressWarnings("serial")
+	public static ResourceBundle create(String baseName) {
         ResourceBundle bundle;
  
         try {
-package org.demoiselle.util;
+package org.demoiselle.jee.core.util;
  
-import javax.enterprise.inject.spi.InjectionPoint;
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
 import java.util.Collection;
  
+import javax.enterprise.inject.spi.InjectionPoint;
+
 /**
  * Utility class to peform useful operations on CDI discovered beans.
  *
@@ -22,7 +22,6 @@ public final class CDIUtils {
 	 * @param allAnnotations List of all annotations where to look for.
 	 * @return <code>true</code> if the annotation is present on the list
 	 */
-	@SuppressWarnings("WeakerAccess")
 	public static boolean hasAnnotation(Class<? extends Annotation> annotationType, Annotation... allAnnotations) {
 		for (Annotation currentAnnotation : allAnnotations) {
 			if (currentAnnotation.annotationType().isAssignableFrom(annotationType)) {
@@ -39,7 +38,6 @@ public final class CDIUtils {
 	 * @see #hasAnnotation(Class, Annotation...)
 	 * @return <code>true</code> if the annotation is present on the list
 	 */
-	@SuppressWarnings("WeakerAccess")
 	public static boolean hasAnnotation(Class<? extends Annotation> annotationType,
 			Collection<Annotation> allAnnotations) {
 		return hasAnnotation(annotationType, allAnnotations.toArray(annotationArrayType));
@@ -53,7 +51,6 @@ public final class CDIUtils {
 	 * @see #hasAnnotation(Class, Annotation...)
 	 * @return <code>true</code> if the annotation is present on the list
 	 */
-	@SuppressWarnings("WeakerAccess")
 	public static boolean hasAnnotation(Class<? extends Annotation> annotationType, Class<?> baseType) {
 		return hasAnnotation(annotationType, baseType.getAnnotations());
 	}
@@ -67,7 +64,7 @@ public final class CDIUtils {
 	 * @param <T> Type of the specific annotation returned
 	 * @return The annotation instance found, or <code>null</code> if there is no such annotation present.
 	 */
-	@SuppressWarnings({ "WeakerAccess", "unchecked" })
+	@SuppressWarnings("unchecked")
 	public static <T extends Annotation> T getAnnotation(Class<T> annotationType, Annotation... allAnnotations) {
 		for (Annotation currentAnnotation : allAnnotations) {
 			if (currentAnnotation.annotationType().isAssignableFrom(annotationType)) {
@@ -85,7 +82,6 @@ public final class CDIUtils {
 	 * @see #getAnnotation(Class, Annotation...)
 	 * @return The annotation instance found, or <code>null</code> if there is no such annotation present.
 	 */
-	@SuppressWarnings({ "WeakerAccess" })
 	public static <T extends Annotation> T getAnnotation(Class<T> annotationType,
 			Collection<Annotation> allAnnotations) {
 		return getAnnotation(annotationType, allAnnotations.toArray(annotationArrayType));
@@ -99,7 +95,6 @@ public final class CDIUtils {
 	 * @param ip                      Injection point of a bean type.
 	 * @return <code>true</code> if the annotation is present on the list
 	 */
-	@SuppressWarnings("WeakerAccess")
 	public static boolean hasQualifier(Class<? extends Annotation> qualifierAnnotationType, InjectionPoint ip) {
 		return hasAnnotation(qualifierAnnotationType, ip.getQualifiers());
 	}
@@ -113,7 +108,6 @@ public final class CDIUtils {
 	 * @param <T> Type of the specific annotation returned
 	 * @return The annotation instance found, or <code>null</code> if there is no such annotation present.
 	 */
-	@SuppressWarnings("WeakerAccess")
 	public static <T extends Annotation> T getQualifier(Class<T> qualifierAnnotationType, InjectionPoint ip) {
 		return getAnnotation(qualifierAnnotationType, ip.getQualifiers());
 	}
@@ -34,7 +34,7 @@
  * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
-package org.demoiselle.util;
+package org.demoiselle.jee.core.util;
  
 /**
  *Class that offer tow methods that can help with manipulation of throwable exceptions.
@@ -34,7 +34,7 @@
  * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  */
-package org.demoiselle.util;
+package org.demoiselle.jee.core.util;
  
 import java.io.InputStream;
 import java.lang.reflect.*;
@@ -36,8 +36,6 @@
  */
 package org.demoiselle.jee.core.util;
  
-import org.demoiselle.jee.core.annotation.Ignore;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,7 +44,8 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.demoiselle.util.Reflections;
+
+import org.demoiselle.jee.core.annotation.Ignore;
  
 /**
  * Contain a set of methods that implements a set of functionalities that
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.demoiselle.jee</groupId>
-    <artifactId>persistence</artifactId>
+    <artifactId>demoiselle-persistence</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>demoiselle-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.demoiselle.jee</groupId>
-    <artifactId>security</artifactId>
+    <artifactId>demoiselle-security</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
@@ -14,7 +14,7 @@
  
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>demoiselle-core</artifactId>
             <version>${project.version}</version>
         </dependency>
  
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.demoiselle.jee</groupId>
-    <artifactId>ws</artifactId>
+    <artifactId>demoiselle-ws</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
@@ -14,7 +14,7 @@
  
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>demoiselle-core</artifactId>
             <version>${project.version}</version>
         </dependency>
1	1	/persistence/target/
2	2	/core/target/
3	3	/ws/target/
4		-/security/target/
5	4	\ No newline at end of file
	5	+/security/target/
	6	+/.project
	7	+/.settings/
...	...
...	...	@@ -3,7 +3,7 @@
3	3	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4	4	<modelVersion>4.0.0</modelVersion>
5	5	<groupId>org.demoiselle.jee</groupId>
6		- <artifactId>core</artifactId>
	6	+ <artifactId>demoiselle-core</artifactId>
7	7	<version>3.0.0-SNAPSHOT</version>
8	8	<packaging>jar</packaging>
9	9	<properties>
...	...
...	...	@@ -7,14 +7,16 @@ package org.demoiselle.jee.core.internal.producer;
7	7
8	8	import java.io.Serializable;
9	9	import java.util.Locale;
10		-import org.demoiselle.jee.core.util.ResourceBundle;
	10	+
11	11	import javax.enterprise.context.Dependent;
12	12	import javax.enterprise.inject.Default;
13	13	import javax.enterprise.inject.Produces;
14	14	import javax.enterprise.inject.spi.CDI;
15	15	import javax.enterprise.inject.spi.InjectionPoint;
	16	+
16	17	import org.demoiselle.jee.core.annotation.Name;
17		-import org.demoiselle.util.CDIUtils;
	18	+import org.demoiselle.jee.core.util.CDIUtils;
	19	+import org.demoiselle.jee.core.util.ResourceBundle;
18	20
19	21	/**
20	22	*
...	...	@@ -53,7 +55,8 @@ public class ResourceBundleProducer implements Serializable {
53	55	return create(baseName);
54	56	}
55	57
56		- public static ResourceBundle create(String baseName) {
	58	+ @SuppressWarnings("serial")
	59	+ public static ResourceBundle create(String baseName) {
57	60	ResourceBundle bundle;
58	61
59	62	try {
...	...
1		-package org.demoiselle.util;
	1	+package org.demoiselle.jee.core.util;
2	2
3		-import javax.enterprise.inject.spi.InjectionPoint;
4	3	import java.lang.annotation.Annotation;
5		-import java.util.Arrays;
6	4	import java.util.Collection;
7	5
	6	+import javax.enterprise.inject.spi.InjectionPoint;
	7	+
8	8	/**
9	9	* Utility class to peform useful operations on CDI discovered beans.
10	10	*
...	...	@@ -22,7 +22,6 @@ public final class CDIUtils {
22	22	* @param allAnnotations List of all annotations where to look for.
23	23	* @return <code>true</code> if the annotation is present on the list
24	24	*/
25		- @SuppressWarnings("WeakerAccess")
26	25	public static boolean hasAnnotation(Class<? extends Annotation> annotationType, Annotation... allAnnotations) {
27	26	for (Annotation currentAnnotation : allAnnotations) {
28	27	if (currentAnnotation.annotationType().isAssignableFrom(annotationType)) {
...	...	@@ -39,7 +38,6 @@ public final class CDIUtils {
39	38	* @see #hasAnnotation(Class, Annotation...)
40	39	* @return <code>true</code> if the annotation is present on the list
41	40	*/
42		- @SuppressWarnings("WeakerAccess")
43	41	public static boolean hasAnnotation(Class<? extends Annotation> annotationType,
44	42	Collection<Annotation> allAnnotations) {
45	43	return hasAnnotation(annotationType, allAnnotations.toArray(annotationArrayType));
...	...	@@ -53,7 +51,6 @@ public final class CDIUtils {
53	51	* @see #hasAnnotation(Class, Annotation...)
54	52	* @return <code>true</code> if the annotation is present on the list
55	53	*/
56		- @SuppressWarnings("WeakerAccess")
57	54	public static boolean hasAnnotation(Class<? extends Annotation> annotationType, Class<?> baseType) {
58	55	return hasAnnotation(annotationType, baseType.getAnnotations());
59	56	}
...	...	@@ -67,7 +64,7 @@ public final class CDIUtils {
67	64	* @param <T> Type of the specific annotation returned
68	65	* @return The annotation instance found, or <code>null</code> if there is no such annotation present.
69	66	*/
70		- @SuppressWarnings({ "WeakerAccess", "unchecked" })
	67	+ @SuppressWarnings("unchecked")
71	68	public static <T extends Annotation> T getAnnotation(Class<T> annotationType, Annotation... allAnnotations) {
72	69	for (Annotation currentAnnotation : allAnnotations) {
73	70	if (currentAnnotation.annotationType().isAssignableFrom(annotationType)) {
...	...	@@ -85,7 +82,6 @@ public final class CDIUtils {
85	82	* @see #getAnnotation(Class, Annotation...)
86	83	* @return The annotation instance found, or <code>null</code> if there is no such annotation present.
87	84	*/
88		- @SuppressWarnings({ "WeakerAccess" })
89	85	public static <T extends Annotation> T getAnnotation(Class<T> annotationType,
90	86	Collection<Annotation> allAnnotations) {
91	87	return getAnnotation(annotationType, allAnnotations.toArray(annotationArrayType));
...	...	@@ -99,7 +95,6 @@ public final class CDIUtils {
99	95	* @param ip Injection point of a bean type.
100	96	* @return <code>true</code> if the annotation is present on the list
101	97	*/
102		- @SuppressWarnings("WeakerAccess")
103	98	public static boolean hasQualifier(Class<? extends Annotation> qualifierAnnotationType, InjectionPoint ip) {
104	99	return hasAnnotation(qualifierAnnotationType, ip.getQualifiers());
105	100	}
...	...	@@ -113,7 +108,6 @@ public final class CDIUtils {
113	108	* @param <T> Type of the specific annotation returned
114	109	* @return The annotation instance found, or <code>null</code> if there is no such annotation present.
115	110	*/
116		- @SuppressWarnings("WeakerAccess")
117	111	public static <T extends Annotation> T getQualifier(Class<T> qualifierAnnotationType, InjectionPoint ip) {
118	112	return getAnnotation(qualifierAnnotationType, ip.getQualifiers());
119	113	}
...	...
...	...	@@ -34,7 +34,7 @@
34	34	* ou escreva para a Fundação do Software Livre (FSF) Inc.,
35	35	* 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36	36	*/
37		-package org.demoiselle.util;
	37	+package org.demoiselle.jee.core.util;
38	38
39	39	/**
40	40	*Class that offer tow methods that can help with manipulation of throwable exceptions.
...	...
...	...	@@ -36,8 +36,6 @@
36	36	*/
37	37	package org.demoiselle.jee.core.util;
38	38
39		-import org.demoiselle.jee.core.annotation.Ignore;
40		-
41	39	import java.io.BufferedReader;
42	40	import java.io.IOException;
43	41	import java.io.InputStream;
...	...	@@ -46,7 +44,8 @@ import java.lang.reflect.Field;
46	44	import java.util.Arrays;
47	45	import java.util.regex.Matcher;
48	46	import java.util.regex.Pattern;
49		-import org.demoiselle.util.Reflections;
	47	+
	48	+import org.demoiselle.jee.core.annotation.Ignore;
50	49
51	50	/**
52	51	* Contain a set of methods that implements a set of functionalities that
...	...
...	...	@@ -2,7 +2,7 @@
2	2	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3	3	<modelVersion>4.0.0</modelVersion>
4	4	<groupId>org.demoiselle.jee</groupId>
5		- <artifactId>persistence</artifactId>
	5	+ <artifactId>demoiselle-persistence</artifactId>
6	6	<version>3.0.0-SNAPSHOT</version>
7	7	<packaging>jar</packaging>
8	8	<properties>
...	...	@@ -13,7 +13,7 @@
13	13	<dependencies>
14	14	<dependency>
15	15	<groupId>${project.groupId}</groupId>
16		- <artifactId>core</artifactId>
	16	+ <artifactId>demoiselle-core</artifactId>
17	17	<version>${project.version}</version>
18	18	</dependency>
19	19	<dependency>
...	...