You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/10/27 14:50:02 UTC
svn commit: r830185 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
Author: lu4242
Date: Tue Oct 27 13:50:02 2009
New Revision: 830185
URL: http://svn.apache.org/viewvc?rev=830185&view=rev
Log:
reorganize algorithm that scan annotations, to make it more simple and revert some errors introduced previously
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=830185&r1=830184&r2=830185&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Tue Oct 27 13:50:02 2009
@@ -166,33 +166,11 @@
boolean metadataComplete) throws FacesException
{
List<Class> classes;
-
+ List<JarFile> archives = null;
+
// Here we have two cases, if metadataComplete we have only to scan
// annotations on myfaces impl jar file, otherwise, scan as usual.
- if (metadataComplete)
- {
- //Read only annotations available myfaces-impl
- List<JarFile> archives = null;
- try
- {
- //Also scan jar including META-INF/standard-faces-config.xml
- //(myfaces-impl jar file)
- JarFile jarFile = getMyfacesImplJarFile();
- if (jarFile != null)
- {
- classes = archiveClasses(_externalContext, jarFile);
- for (Class clazz : classes)
- {
- configureClass(application, dispenser, clazz);
- }
- }
- }
- catch (Exception e)
- {
- throw new FacesException(e);
- }
- }
- else
+ if (!metadataComplete)
{
// Scan annotation available in org.apache.myfaces.annotation.SCAN_PACKAGES
// init param
@@ -239,14 +217,13 @@
}
// Scan the classes in /WEB-INF/lib for interesting annotations
- List<JarFile> archives = null;
try
{
archives = webArchives(_externalContext);
- if (log.isTraceEnabled())
+ if (log.isLoggable(Level.FINEST))
{
- log.trace("Receiving " + archives.size() + " jar files to check");
+ log.finest("Receiving " + archives.size() + " jar files to check");
}
for (JarFile archive : archives)
{
@@ -257,42 +234,29 @@
}
}
}
+ catch (Exception e)
+ {
+ throw new FacesException(e);
+ }
}
- catch (Exception e)
- {
- throw new FacesException(e);
- }
-
- // Scan the classes in /WEB-INF/lib for interesting annotations
- List<JarFile> archives = null;
+ //Read only annotations available myfaces-impl
try
- {
- archives = webArchives(_externalContext);
-
- if (log.isLoggable(Level.FINEST))
+ {
+ //Also scan jar including META-INF/standard-faces-config.xml
+ //(myfaces-impl jar file)
+ JarFile jarFile = getMyfacesImplJarFile();
+ if (jarFile != null)
{
- log.finest("Receiving " + archives.size() + " jar files to check");
- }
-
- // Scan annotations available myfaces-impl
- try
- {
- //Also scan jar including META-INF/standard-faces-config.xml
- //(myfaces-impl jar file)
- JarFile jarFile = getMyfacesImplJarFile();
- if (jarFile != null)
+ classes = archiveClasses(_externalContext, jarFile);
+ for (Class clazz : classes)
{
- classes = archiveClasses(_externalContext, jarFile);
- for (Class clazz : classes)
- {
- configureClass(application, dispenser, clazz);
- }
+ configureClass(application, dispenser, clazz);
}
}
- catch (Exception e)
- {
- throw new FacesException(e);
- }
+ }
+ catch (Exception e)
+ {
+ throw new FacesException(e);
}
}