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/14 00:15:22 UTC
svn commit: r517934 - in /myfaces:
core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/
core/branches/jsf12/impl/src/main/resources/META-INF/services/
current12/test-webapp/
Author: bommel
Date: Tue Mar 13 16:15:20 2007
New Revision: 517934
URL: http://svn.apache.org/viewvc?view=rev&rev=517934
Log:
(MYFACES-1246)
(MYFACES-1559)
TomcatAnnotationLifecycleProvider works now
Added:
myfaces/core/branches/jsf12/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
myfaces/current12/test-webapp/pom.xml
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?view=diff&rev=517934&r1=517933&r2=517934
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Tue Mar 13 16:15:20 2007
@@ -33,6 +33,7 @@
private ExternalContext externalContext;
private org.apache.AnnotationProcessor annotationProcessor;
+
public TomcatAnnotationLifecycleProvider(ExternalContext externalContext)
{
this.externalContext = externalContext;
@@ -42,7 +43,7 @@
public Object newInstance(String className)
throws InstantiationException, IllegalAccessException, InvocationTargetException, NamingException, ClassNotFoundException {
Class clazz = ClassUtils.classForName(className);
- log.error("Creating instance of " + className);
+ log.info("Creating instance of " + className);
Object object = clazz.newInstance();
annotationProcessor.processAnnotations(object);
annotationProcessor.postConstruct(object);
@@ -52,7 +53,7 @@
public void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException
{
- log.error("Destroy instance of " + o.getClass().getName());
+ log.info("Destroy instance of " + o.getClass().getName());
annotationProcessor.preDestroy(o);
}
@@ -68,11 +69,5 @@
}
return false;
}
-
-
-
-
-
-
}
Added: myfaces/core/branches/jsf12/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider?view=auto&rev=517934
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider (added)
+++ myfaces/core/branches/jsf12/impl/src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider Tue Mar 13 16:15:20 2007
@@ -0,0 +1 @@
+org.apache.myfaces.config.annotation.TomcatAnnotationLifecycleProvider
\ No newline at end of file
Modified: myfaces/current12/test-webapp/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current12/test-webapp/pom.xml?view=diff&rev=517934&r1=517933&r2=517934
==============================================================================
--- myfaces/current12/test-webapp/pom.xml (original)
+++ myfaces/current12/test-webapp/pom.xml Tue Mar 13 16:15:20 2007
@@ -40,6 +40,13 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
<!--<dependencies>
<dependency>
<groupId>tomcat</groupId>
@@ -119,7 +126,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
+ <scope>provided</scope>
+ <version>1.0</version>
</dependency>
<dependency>