Author: rmannibucau
Date: Tue Dec 27 22:21:09 2011
New Revision: 1225032
URL: http://svn.apache.org/viewvc?rev=1225032&view=rev
Log:
upgrading OWB and CXF versions
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
openejb/trunk/openejb/pom.xml
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1225032&r1=1225031&r2=1225032&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Tue Dec 27 22:21:09 2011
@@ -268,7 +268,7 @@ public class OpenEJBLifecycle implements
beanContext.set(CurrentCreationalContext.class, new
CurrentCreationalContext());
beanContext.addSystemInterceptor(new CdiInterceptor(bean,
beanManager, cdiPlugin.getContexsServices()));
- fireEvents((Class<Object>) implClass, bean,
(ProcessAnnotatedTypeImpl<Object>) processAnnotatedEvent);
+ EjbUtility.fireEvents((Class<Object>) implClass, bean,
(ProcessAnnotatedTypeImpl<Object>) processAnnotatedEvent);
webBeansContext.getWebBeansUtil().setInjectionTargetBeanEnableFlag(bean);
@@ -343,137 +343,6 @@ public class OpenEJBLifecycle implements
logger.info(OWBLogConst.INFO_0001,
Long.toString(System.currentTimeMillis() - begin));
}
- // TODO:
- // big copy/paste from OWB to fix the propagation of annotatedtype (look
if(processAnnotatedEvent.isModifiedAnnotatedType()) block)
- // when it will be fixed simply remove this method and replace it by the
EJBUtility one
- public static <T> void fireEvents(Class<T> clazz, BaseEjbBean<T>
ejbBean,ProcessAnnotatedType<T> event)
- {
- WebBeansContext webBeansContext = ejbBean.getWebBeansContext();
- BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
- AnnotatedElementFactory annotatedElementFactory =
webBeansContext.getAnnotatedElementFactory();
-
- AnnotatedType<T> annotatedType =
annotatedElementFactory.newAnnotatedType(clazz);
-
- //Fires ProcessAnnotatedType
- ProcessAnnotatedTypeImpl<T> processAnnotatedEvent =
(ProcessAnnotatedTypeImpl<T>)event;
- EjbBeanCreatorImpl<T> ejbBeanCreator = new
EjbBeanCreatorImpl<T>(ejbBean);
- ejbBeanCreator.checkCreateConditions();
-
- if(processAnnotatedEvent.isVeto())
- {
- return;
- }
-
- if(processAnnotatedEvent.isModifiedAnnotatedType())
- {
-
ejbBeanCreator.setMetaDataProvider(BeanCreator.MetaDataProvider.THIRDPARTY);
- ejbBeanCreator.setAnnotatedType(annotatedType); // missing lin ein
OWB
- }
-
- //Define meta-data
- ejbBeanCreator.defineSerializable();
- ejbBeanCreator.defineStereoTypes();
- ejbBeanCreator.defineApiType();
- ejbBeanCreator.defineScopeType("Session Bean implementation class : "
+ clazz.getName() + " stereotypes must declare same @ScopeType annotations",
false);
- ejbBeanCreator.defineQualifier();
-
ejbBeanCreator.defineName(WebBeansUtil.getManagedBeanDefaultName(clazz.getSimpleName()));
- Set<ProducerMethodBean<?>> producerMethodBeans =
ejbBeanCreator.defineProducerMethods();
- for(ProducerMethodBean<?> producerMethodBean : producerMethodBeans)
- {
- Method producerMethod = producerMethodBean.getCreatorMethod();
- if(!Modifier.isStatic(producerMethod.getModifiers()))
- {
- if(!EjbUtility.isBusinessMethod(producerMethod, ejbBean))
- {
- throw new WebBeansConfigurationException("Producer Method
Bean must be business method of session bean : " + ejbBean);
- }
- }
- }
- Set<ProducerFieldBean<?>> producerFieldBeans =
ejbBeanCreator.defineProducerFields();
- ejbBeanCreator.defineInjectedFields();
- ejbBeanCreator.defineInjectedMethods();
- Set<ObserverMethod<?>> observerMethods =
ejbBeanCreator.defineObserverMethods();
-
- //Fires ProcessInjectionTarget
- ProcessInjectionTargetImpl<T> processInjectionTargetEvent =
-
webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(ejbBean);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessInjectionTarget
event observers. Look at logs for further details");
- //Put final InjectionTarget instance
- manager.putInjectionTargetWrapper(ejbBean, new
InjectionTargetWrapper(processInjectionTargetEvent.getInjectionTarget()));
-
- Map<ProducerMethodBean<?>,AnnotatedMethod<?>> annotatedMethods = new
HashMap<ProducerMethodBean<?>, AnnotatedMethod<?>>();
- for(ProducerMethodBean<?> producerMethod : producerMethodBeans)
- {
- AnnotatedMethod<?> method =
annotatedElementFactory.newAnnotatedMethod(producerMethod.getCreatorMethod(),
annotatedType);
- ProcessProducerImpl<?, ?> producerEvent =
-
webBeansContext.getWebBeansUtil().fireProcessProducerEventForMethod(producerMethod,
- method);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessProducer event
observers for ProducerMethods. Look at logs for further details");
-
- annotatedMethods.put(producerMethod, method);
- manager.putInjectionTargetWrapper(producerMethod, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
- producerEvent.setProducerSet(false);
- }
-
- Map<ProducerFieldBean<?>,AnnotatedField<?>> annotatedFields = new
HashMap<ProducerFieldBean<?>, AnnotatedField<?>>();
- for(ProducerFieldBean<?> producerField : producerFieldBeans)
- {
- AnnotatedField<?> field =
annotatedElementFactory.newAnnotatedField(producerField.getCreatorField(),
annotatedType);
- ProcessProducerImpl<?, ?> producerEvent =
-
webBeansContext.getWebBeansUtil().fireProcessProducerEventForField(producerField,
field);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessProducer event
observers for ProducerFields. Look at logs for further details");
-
- annotatedFields.put(producerField, field);
- manager.putInjectionTargetWrapper(producerField, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
-
- producerEvent.setProducerSet(false);
- }
-
- Map<ObserverMethod<?>,AnnotatedMethod<?>> observerMethodsMap = new
HashMap<ObserverMethod<?>, AnnotatedMethod<?>>();
- for(ObserverMethod<?> observerMethod : observerMethods)
- {
- ObserverMethodImpl<?> impl = (ObserverMethodImpl<?>)observerMethod;
- AnnotatedMethod<?> method =
annotatedElementFactory.newAnnotatedMethod(impl.getObserverMethod(),
annotatedType);
-
- observerMethodsMap.put(observerMethod, method);
- }
-
- //Fires ProcessManagedBean
- ProcessSessionBeanImpl<T> processBeanEvent = new
GProcessSessionBean((Bean<Object>)ejbBean,annotatedType,ejbBean.getEjbName(),ejbBean.getEjbType());
- webBeansContext.getBeanManagerImpl().fireEvent(processBeanEvent, new
Annotation[0]);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessSessionBean event
observers for managed beans. Look at logs for further details");
-
- //Fires ProcessProducerMethod
-
webBeansContext.getWebBeansUtil().fireProcessProducerMethodBeanEvent(annotatedMethods,
- annotatedType);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessProducerMethod
event observers for producer method beans. Look at logs for further details");
-
- //Fires ProcessProducerField
-
webBeansContext.getWebBeansUtil().fireProcessProducerFieldBeanEvent(annotatedFields);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessProducerField event
observers for producer field beans. Look at logs for further details");
-
- //Fire ObservableMethods
-
webBeansContext.getWebBeansUtil().fireProcessObservableMethodBeanEvent(observerMethodsMap);
- webBeansContext.getWebBeansUtil().inspectErrorStack(
- "There are errors that are added by ProcessObserverMethod
event observers for observer methods. Look at logs for further details");
-
- manager.addBean(ejbBean);
-
- // Let the plugin handle adding the new bean instance as it knows more
about its EJB Bean
-
- manager.getBeans().addAll(producerMethodBeans);
- ejbBeanCreator.defineDisposalMethods();
- manager.getBeans().addAll(producerFieldBeans);
- }
-
public static class NewEjbBean<T> extends CdiEjbBean<T> implements
NewBean<T> {
public NewEjbBean(BeanContext beanContext, WebBeansContext
webBeansContext) {
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1225032&r1=1225031&r2=1225032&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue Dec 27 22:21:09 2011
@@ -114,8 +114,8 @@
<tomcat.version>7.0.21</tomcat.version>
<!-- used mainly by jetty modules -->
- <openejb-cxf.version>2.4.3-SNAPSHOT</openejb-cxf.version>
- <jetty.version>7.4.2.v20110526</jetty.version>
+ <openejb-cxf.version>2.5.1-SNAPSHOT</openejb-cxf.version>
+ <jetty.version>7.5.3.v20111011</jetty.version>
<!--
-
http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
@@ -129,7 +129,7 @@
<junit.version>4.8.1</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<scannotation.version>1.0.2</scannotation.version>
- <org.apache.openwebbeans.version>1.1.1</org.apache.openwebbeans.version>
+
<org.apache.openwebbeans.version>1.1.4-SNAPSHOT</org.apache.openwebbeans.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
@@ -145,7 +145,7 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-logging-api.version>1.1</commons-logging-api.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
- <commons-pool.version>1.5.6</commons-pool.version>
+ <commons-pool.version>1.5.7</commons-pool.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-codec.version>1.4</commons-codec.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
