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/03 22:28:20 UTC
svn commit: r514246 - in /myfaces/core/branches/jsf12/impl/src:
main/java/org/apache/ main/java/org/apache/myfaces/config/
main/java/org/apache/myfaces/config/annotation/
test/java/org/apache/myfaces/config/annotation/
Author: bommel
Date: Sat Mar 3 13:28:19 2007
New Revision: 514246
URL: http://svn.apache.org/viewvc?view=rev&rev=514246
Log:
revert checkin
Removed:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/AnnotationProcessor.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationProcessor.java
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/config/annotation/NoInjectionAnnotationProcessor.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/NopAnnotationProcessor.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationProcessor.java
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?view=diff&rev=514246&r1=514245&r2=514246
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Sat Mar 3 13:28:19 2007
@@ -16,7 +16,6 @@
package org.apache.myfaces.config;
import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -33,12 +32,11 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.webapp.UIComponentTag;
-import javax.naming.NamingException;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.annotation.AnnotationProcessorFactory;
+import org.apache.myfaces.config.annotation.AnnotatedManagedBeanHandler;
import org.apache.myfaces.config.element.ListEntries;
import org.apache.myfaces.config.element.ListEntry;
import org.apache.myfaces.config.element.ManagedBean;
@@ -67,33 +65,13 @@
{
final Object bean = ClassUtils.newInstance(beanConfiguration.getManagedBeanClassName());
- /*final AnnotatedManagedBeanHandler handler = new AnnotatedManagedBeanHandler(bean,
+ final AnnotatedManagedBeanHandler handler = new AnnotatedManagedBeanHandler(bean,
beanConfiguration.getManagedBeanScope(), beanConfiguration.getManagedBeanName());
final boolean threwUnchecked = handler.invokePostConstruct();
if(threwUnchecked)
- return null; */
- try
- {
- AnnotationProcessorFactory.getAnnotatonProcessor().processAnnotations(bean);
- if (!beanConfiguration.getManagedBeanScope().equals(ManagedBeanBuilder.NONE))
- {
- AnnotationProcessorFactory.getAnnotatonProcessor().postConstruct(bean);
- }
- }
- catch (IllegalAccessException e)
- {
- throw new FacesException(e);
- }
- catch (InvocationTargetException e)
- {
- throw new FacesException(e);
- }
- catch (NamingException e)
- {
- throw new FacesException(e);
- }
+ return null;
switch (beanConfiguration.getInitMode())
{
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java?view=diff&rev=514246&r1=514245&r2=514246
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBeanHandlerTestCase.java Sat Mar 3 13:28:19 2007
@@ -3,9 +3,6 @@
import junit.framework.TestCase;
import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.AnnotationProcessor;
-
-import java.lang.reflect.InvocationTargetException;
/**
* @author Dennis Byrne
@@ -15,50 +12,45 @@
protected AnnotatedManagedBean managedBean;
protected AnnotatedManagedBeanHandler handler;
- protected AnnotationProcessor processor;
- protected final String NAME = "volker weber";
+ protected final String NAME = "volker weber";
public void setUp() {
managedBean = new AnnotatedManagedBean(null);
- processor = new NoInjectionAnnotationProcessor();
- }
+ }
- public void testPostConstructShouldNotInvokeForNoneScope() throws IllegalAccessException, InvocationTargetException {
+ public void testPostConstructShouldNotInvokeForNoneScope() {
- /*handler = new AnnotatedManagedBeanHandler(managedBean,
+ handler = new AnnotatedManagedBeanHandler(managedBean,
ManagedBeanBuilder.NONE, NAME);
boolean threwUnchecked = handler.invokePostConstruct();
- assertFalse(threwUnchecked);*/
- processor.postConstruct(managedBean);
- assertFalse(managedBean.isPostConstructCalled());
+ assertFalse(threwUnchecked);
+ assertFalse(managedBean.isPostConstructCalled());
assertFalse(managedBean.isPreDestroyCalled());
}
- public void testPreDestroyShouldNotInvokeForNoneScope() throws IllegalAccessException, InvocationTargetException {
+ public void testPreDestroyShouldNotInvokeForNoneScope() {
- /*handler = new AnnotatedManagedBeanHandler(managedBean,
+ handler = new AnnotatedManagedBeanHandler(managedBean,
ManagedBeanBuilder.NONE, NAME);
boolean threwUnchecked = handler.invokePreDestroy();
- assertFalse(threwUnchecked);*/
- processor.preDestroy(managedBean);
- assertFalse(managedBean.isPostConstructCalled());
+ assertFalse(threwUnchecked);
+ assertFalse(managedBean.isPostConstructCalled());
assertFalse(managedBean.isPreDestroyCalled());
}
- public void testPostConstructShouldInvokeForRequestScope() throws IllegalAccessException, InvocationTargetException {
+ public void testPostConstructShouldInvokeForRequestScope() {
- /*handler = new AnnotatedManagedBeanHandler(managedBean,
+ handler = new AnnotatedManagedBeanHandler(managedBean,
ManagedBeanBuilder.REQUEST, NAME);
boolean threwUnchecked = handler.invokePostConstruct();
- assertFalse(threwUnchecked);*/
- processor.postConstruct(managedBean);
- assertTrue(managedBean.isPostConstructCalled());
+ assertFalse(threwUnchecked);
+ assertTrue(managedBean.isPostConstructCalled());
assertFalse(managedBean.isPreDestroyCalled());
}