You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/03/25 18:35:16 UTC
svn commit: r1085484 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi:
BeansDeployer.java OWBInjector.java
Author: jgallimore
Date: Fri Mar 25 17:35:16 2011
New Revision: 1085484
URL: http://svn.apache.org/viewvc?rev=1085484&view=rev
Log:
Fix some OWB related compile errors with latest OWB snapshots
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java?rev=1085484&r1=1085483&r2=1085484&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java Fri Mar 25 17:35:16 2011
@@ -133,7 +133,7 @@ public class BeansDeployer {
Class<?> beanClass = ClassUtil.getClassFromName(className);
if (beanClass != null) {
- bean = (Bean) ClassUtil.newInstance(beanClass);
+ bean = (Bean) ClassUtil.newInstance(webBeansContext, beanClass);
}
if (bean != null) {
@@ -244,12 +244,12 @@ public class BeansDeployer {
if (!(bean instanceof Decorator) &&
!(bean instanceof javax.enterprise.inject.spi.Interceptor) &&
!(bean instanceof NewBean)) {
- DefinitionUtil.defineDecoratorStack((AbstractInjectionTargetBean<Object>) bean);
+ new DefinitionUtil(webBeansContext).defineDecoratorStack((AbstractInjectionTargetBean<Object>) bean);
}
//If intercepted marker
if (bean instanceof InterceptedMarker) {
- DefinitionUtil.defineBeanInterceptorStack((AbstractInjectionTargetBean<Object>) bean);
+ new DefinitionUtil(webBeansContext).defineBeanInterceptorStack((AbstractInjectionTargetBean<Object>) bean);
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java?rev=1085484&r1=1085483&r2=1085484&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/OWBInjector.java Fri Mar 25 17:35:16 2011
@@ -24,6 +24,7 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.InjectionResolver;
import org.apache.webbeans.context.creational.CreationalContextImpl;
+import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansAnnotatedTypeUtil;
import org.apache.webbeans.util.WebBeansUtil;
@@ -130,7 +131,13 @@ public final class OWBInjector {
//Set field
Field field = (Field) injectionPoint.getMember();
- ClassUtil.setField(javaEeComponentInstance, field, object);
+
+ try {
+ field.setAccessible(true);
+ field.set(javaEeComponentInstance, object);
+ } catch (Exception e) {
+ throw new WebBeansException(e);
+ }
}
}