You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/03/04 22:24:08 UTC
svn commit: r514476 - in /myfaces/core/branches/jsf12/impl/src:
main/java/org/apache/myfaces/config/annotation/
main/java/org/apache/myfaces/webapp/
test/java/org/apache/myfaces/config/annotation/
Author: bommel
Date: Sun Mar 4 13:24:08 2007
New Revision: 514476
URL: http://svn.apache.org/viewvc?view=rev&rev=514476
Log:
(MYFACES-1246)
some cleanups
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationProcessorFactory.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationProcessorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationProcessorFactory.java?view=diff&rev=514476&r1=514475&r2=514476
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationProcessorFactory.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationProcessorFactory.java Sun Mar 4 13:24:08 2007
@@ -46,14 +46,19 @@
{
if (ANNOTATION_PROCESSOR_INSTANCE == null)
{
- if (externalContext == null) {
- throw new NullPointerException("AnnotationProcessorFactory is not configured and ExternalContext is null");
+ if (externalContext == null)
+ {
+ log.info("No ExternalContext using fallback annotation processor.");
+ resolveFallbackAnnotationProcessor();
}
- if (!resolveAnnotationProcessorFromExternalContext(externalContext))
+ else
{
- if (!resolveAnnotationProcessorFromService(externalContext))
+ if (!resolveAnnotationProcessorFromExternalContext(externalContext))
{
- resolveFallbackAnnotationProcessor();
+ if (!resolveAnnotationProcessorFromService(externalContext))
+ {
+ resolveFallbackAnnotationProcessor();
+ }
}
}
}
@@ -80,7 +85,7 @@
ANNOTATION_PROCESSOR_INSTANCE = (AnnotationProcessor) obj;
return true;
}
- }
+ }
}
catch (ClassNotFoundException e)
{
@@ -136,11 +141,11 @@
}
catch (IllegalAccessException e)
{
- log.error("", e);
+ log.error("", e);
}
catch (InvocationTargetException e)
{
- log.error("", e);
+ log.error("", e);
}
}
return false;
@@ -152,7 +157,8 @@
Class clazz = ClassUtils.classForName(className);
Object obj;
- try {
+ try
+ {
Constructor constructor = clazz.getConstructor(ExternalContext.class);
obj = constructor.newInstance(externalContext);
} catch (NoSuchMethodException e) {
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java?view=diff&rev=514476&r1=514475&r2=514476
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java Sun Mar 4 13:24:08 2007
@@ -57,8 +57,7 @@
try
{
- // AnnotationProcessor already configured
- AnnotationProcessorFactory.getAnnotatonProcessor(null).preDestroy(value);
+ AnnotationProcessorFactory.getAnnotatonProcessor(null).preDestroy(value);
} catch (IllegalAccessException e)
{
log.error("", e);
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java?view=diff&rev=514476&r1=514475&r2=514476
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedExceptionManagedBeanHandlerTestCase.java Sun Mar 4 13:24:08 2007
@@ -58,7 +58,6 @@
public void testPostConstructShouldBlowUpForRequestScope() {
- try {
handler = new AnnotatedManagedBeanHandler(managedBean,
ManagedBeanBuilder.REQUEST, NAME);
@@ -69,9 +68,6 @@
assertTrue(exceptionThrown);
assertTrue(managedBean.isPostConstructCalled());
assertFalse(managedBean.isPreDestroyCalled());
- } catch (Throwable e) {
- e.printStackTrace();
- }
}
public void testPreDestroyShouldBlowUpForRequestScope() {