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

Emerson Oliveira
2 parents a523f28e 4cd7d730
Showing 6 changed files with 31 additions and 29 deletions Show diff stats
impl/core/pom.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java
parent/extension/pom.xml
parent/minimal/pom.xml
pom.xml
site/apt/release-notes.apt
@@ -73,8 +73,8 @@
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
 				<version>2.3.0-SNAPSHOT</version>
-				<type>pom</type>
 				<scope>import</scope>
+				<type>pom</type>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -62,8 +62,9 @@ public class ConfigurationBootstrap implements Extension {
 	private final List<Class<Object>> cache = Collections.synchronizedList(new ArrayList<Class<Object>>());
-	private static final Map<ClassLoader, List<String>> cacheClassLoader = Collections.synchronizedMap(new HashMap<ClassLoader, List<String>>());
-	
+	private static final Map<ClassLoader, Map<String, Class<Object>>> cacheClassLoader = Collections
+			.synchronizedMap(new HashMap<ClassLoader, Map<String, Class<Object>>>());
+
 	public void processAnnotatedType(@Observes final ProcessAnnotatedType<Object> event) {
 		final AnnotatedType<Object> annotatedType = event.getAnnotatedType();
@@ -78,9 +79,7 @@ public class ConfigurationBootstrap implements Extension {
 		for (Class<Object> config : cache) {
 			proxy = createProxy(config);
-			if (proxy != null) {
-				event.addBean(new CustomBean(proxy, beanManager));
-			}
+			event.addBean(new CustomBean(proxy, beanManager));
 		}
 	}
@@ -89,24 +88,20 @@ public class ConfigurationBootstrap implements Extension {
 		String superClassName = type.getCanonicalName();
 		String chieldClassName = superClassName + "__DemoiselleProxy";
-		Class<Object> clazz = null;
-		
-		Boolean loaded = true;
+		Map<String, Class<Object>> cacheProxy = Collections.synchronizedMap(new HashMap<String, Class<Object>>());;
+
+		Class<Object> clazzProxy = null;
+
 		ClassLoader classLoader = type.getClassLoader();
-		if (cacheClassLoader.containsKey(classLoader)) { 
-			if (!cacheClassLoader.get(classLoader).contains(chieldClassName)) { 
-				loaded = false;
+		if (cacheClassLoader.containsKey(classLoader)) {
+			cacheProxy = cacheClassLoader.get(classLoader);
+			if (cacheProxy.containsKey(chieldClassName)) {
+				clazzProxy = cacheProxy.get(chieldClassName);
 			}
 		}
-		else{
-			List<String> strings = Collections.synchronizedList(new ArrayList<String>());
-			cacheClassLoader.put(classLoader, strings);
-			loaded = false;
-		}
-		
-		if (!loaded){
-			cacheClassLoader.get(classLoader).add(chieldClassName);
-			
+
+		if (clazzProxy == null) {
+
 			ClassPool pool = new ClassPool();
 			CtClass ctChieldClass = pool.getOrNull(chieldClassName);
@@ -123,9 +118,13 @@ public class ConfigurationBootstrap implements Extension {
 				ctChieldClass.addMethod(ctChieldMethod);
 			}
-			clazz = ctChieldClass.toClass(classLoader, type.getProtectionDomain()); 
+
+			clazzProxy = ctChieldClass.toClass(classLoader, type.getProtectionDomain());
+
+			cacheProxy.put(chieldClassName, clazzProxy);
+			cacheClassLoader.put(classLoader, cacheProxy);
 		}
-		return clazz;
-	}	
+		return clazzProxy;
+	}
 }
@@ -72,8 +72,8 @@
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
 				<version>2.3.0-SNAPSHOT</version>
-				<type>pom</type>
 				<scope>import</scope>
+				<type>pom</type>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -73,8 +73,8 @@
 				<groupId>br.gov.frameworkdemoiselle</groupId>
 				<artifactId>demoiselle-framework-bom</artifactId>
 				<version>2.3.0-SNAPSHOT</version>
-				<type>pom</type>
 				<scope>import</scope>
+				<type>pom</type>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -45,7 +45,7 @@
 	<parent>
 		<groupId>br.gov.frameworkdemoiselle</groupId>
 		<artifactId>demoiselle-build-parent</artifactId>
-		<version>3</version>
+		<version>4</version>
 		<relativePath>../internal/parent/build/demoiselle</relativePath>
 	</parent>
@@ -132,6 +132,5 @@
 	<properties>
 		<project.alias>framework</project.alias>
-		<project.nextVersion>2.3.0-SNAPSHOT</project.nextVersion>
 	</properties>
 </project>
@@ -38,7 +38,11 @@
 Notas de Versão
-* v2.3.0-RC2
+* v2.3.0-RC3
+
+  * {{{http://sourceforge.net/apps/mantisbt/demoiselle/view.php?id=0000869}0000869}} [Task] Atualização para versão 2.3.2 do plugin de release.
+
+* {{{../2.3.0-RC2/}v2.3.0-RC2}}
   * {{{http://sourceforge.net/apps/mantisbt/demoiselle/view.php?id=0000864}0000864}} [Bug] Correção no redirecionamento de URL na extensão JSF.