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/13 21:09:39 UTC
svn commit: r517844 - in
/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces:
DiscoverableAnnotationProcessor.java
config/annotation/TomcatAnnotationProcessor.java
Author: bommel
Date: Tue Mar 13 13:09:36 2007
New Revision: 517844
URL: http://svn.apache.org/viewvc?view=rev&rev=517844
Log:
(MYFACES-1246)
fixed TomcatAnnotationProcessor
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/DiscoverableAnnotationProcessor.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationProcessor.java
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/DiscoverableAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/DiscoverableAnnotationProcessor.java?view=diff&rev=517844&r1=517843&r2=517844
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/DiscoverableAnnotationProcessor.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/DiscoverableAnnotationProcessor.java Tue Mar 13 13:09:36 2007
@@ -18,8 +18,6 @@
*/
-import org.apache.myfaces.AnnotationProcessor;
-
public interface DiscoverableAnnotationProcessor extends AnnotationProcessor
{
public boolean isAvailable();
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationProcessor.java?view=diff&rev=517844&r1=517843&r2=517844
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationProcessor.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationProcessor.java Tue Mar 13 13:09:36 2007
@@ -29,7 +29,7 @@
public class TomcatAnnotationProcessor implements DiscoverableAnnotationProcessor
{
private ExternalContext externalContext;
-
+ private org.apache.AnnotationProcessor annotationProcessor;
public TomcatAnnotationProcessor(ExternalContext externalContext)
{
this.externalContext = externalContext;
@@ -46,7 +46,9 @@
{
try
{
- return ClassUtils.classForName("org.apache.catalina.util.DefaultAnnotationProcessor") != null;
+ annotationProcessor = (org.apache.AnnotationProcessor) ((ServletContext)
+ externalContext.getContext()).getAttribute(org.apache.AnnotationProcessor.class.getName());
+ return annotationProcessor != null;
} catch (Exception e) {
// ignore
}
@@ -55,23 +57,17 @@
public void postConstruct(Object instance) throws IllegalAccessException, InvocationTargetException
{
- getAnnotationPrcessor().postConstruct(instance);
+ annotationProcessor.postConstruct(instance);
}
public void preDestroy(Object instance) throws IllegalAccessException, InvocationTargetException
{
- getAnnotationPrcessor().preDestroy(instance);
+ annotationProcessor.preDestroy(instance);
}
public void processAnnotations(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException
{
- getAnnotationPrcessor().processAnnotations(instance);
- }
-
- private org.apache.AnnotationProcessor getAnnotationPrcessor()
- {
- return (org.apache.AnnotationProcessor)
- ((ServletContext) externalContext.getContext()).getAttribute(org.apache.AnnotationProcessor.class.getName());
+ annotationProcessor.processAnnotations(instance);
}
}