You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/22 18:55:08 UTC
[1/3] tomee git commit: BeanAttributes are now given by OWB to
EjbBeanBuilder
Repository: tomee
Updated Branches:
refs/heads/develop 49745bca5 -> 27bdf6688
BeanAttributes are now given by OWB to EjbBeanBuilder
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/12274a4f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/12274a4f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/12274a4f
Branch: refs/heads/develop
Commit: 12274a4f2f91f187e7775ad09c645cb4eff8d848
Parents: 49745bc
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 22 18:26:19 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 22 18:26:19 2014 +0100
----------------------------------------------------------------------
.../arquillian/openejb/OpenEJBArchiveProcessor.java | 2 --
.../openejb/OpenEJBDeployableContainer.java | 1 -
.../main/java/org/apache/openejb/cdi/CdiEjbBean.java | 14 ++++++++------
.../main/java/org/apache/openejb/cdi/CdiPlugin.java | 5 +++--
.../java/org/apache/openejb/cdi/NewCdiEjbBean.java | 5 ++++-
.../org/apache/openejb/cdi/OpenEJBBeanBuilder.java | 8 +++++---
.../org/superbiz/cdi/stereotype/StereotypeTest.java | 2 +-
.../java/org/superbiz/cdi/stereotype/SuperCar.java | 2 +-
8 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
index 12de19d..e15338c 100644
--- a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
+++ b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
@@ -21,7 +21,6 @@ import org.apache.openejb.OpenEJBException;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.cdi.CompositeBeans;
import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.ConfigurableClasspathArchive;
import org.apache.openejb.config.DeploymentLoader;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.config.FinderFactory;
@@ -63,7 +62,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
index 2c21c58..98c75f7 100644
--- a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
+++ b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
@@ -26,7 +26,6 @@ import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory;
import org.apache.openejb.assembler.classic.WebAppBuilder;
-import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.DeploymentFilterable;
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
index 32105cc..1b36017 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
@@ -26,7 +26,6 @@ import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.openejb.util.proxy.ProxyManager;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.InterceptedMarker;
-import org.apache.webbeans.component.creation.BeanAttributesBuilder;
import org.apache.webbeans.config.DeploymentValidationService;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
@@ -43,6 +42,7 @@ import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanAttributes;
import javax.enterprise.inject.spi.DefinitionException;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
@@ -75,14 +75,16 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker,
private BeanContext.BusinessLocalHome home;
private BeanContext.BusinessRemoteHome remote;
- public CdiEjbBean(final BeanContext beanContext, final WebBeansContext webBeansContext, final AnnotatedType<T> at) {
- this(beanContext, webBeansContext, beanContext.getManagedClass(), at, new EjbInjectionTargetFactory<T>(at, webBeansContext));
+ public CdiEjbBean(final BeanContext beanContext, final WebBeansContext webBeansContext, final AnnotatedType<T> at,
+ final BeanAttributes<T> attributes) {
+ this(beanContext, webBeansContext, beanContext.getManagedClass(), at, new EjbInjectionTargetFactory<T>(at, webBeansContext), attributes);
EjbInjectionTargetImpl.class.cast(getInjectionTarget()).setCdiEjbBean(this);
}
- public CdiEjbBean(final BeanContext beanContext, final WebBeansContext webBeansContext, final Class beanClass, final AnnotatedType<T> at, final InjectionTargetFactoryImpl<T> factory) {
+ public CdiEjbBean(final BeanContext beanContext, final WebBeansContext webBeansContext, final Class beanClass, final AnnotatedType<T> at,
+ final InjectionTargetFactoryImpl<T> factory, final BeanAttributes<T> attributes) {
super(webBeansContext, toSessionType(beanContext.getComponentType()), at, new EJBBeanAttributesImpl<T>(beanContext,
- BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(at).build()), beanClass, factory);
+ attributes), beanClass, factory);
this.beanContext = beanContext;
beanContext.set(Bean.class, this);
passivatingId = beanContext.getDeploymentID() + getReturnType().getName();
@@ -297,7 +299,7 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker,
private final BeanContext beanContext;
private final Set<Type> ejbTypes;
- public EJBBeanAttributesImpl(final BeanContext bc, final BeanAttributesImpl<T> beanAttributes) {
+ public EJBBeanAttributesImpl(final BeanContext bc, final BeanAttributes<T> beanAttributes) {
super(beanAttributes, false);
this.beanContext = bc;
this.ejbTypes = new HashSet<Type>();
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
index eb1f876..31a7a6a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
@@ -59,6 +59,7 @@ import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanAttributes;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.ObserverMethod;
import javax.enterprise.inject.spi.PassivationCapable;
@@ -273,9 +274,9 @@ public class CdiPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPl
}
@Override
- public <T> Bean<T> defineSessionBean(final Class<T> clazz, final AnnotatedType<T> annotatedType) {
+ public <T> Bean<T> defineSessionBean(final Class<T> clazz, final BeanAttributes<T> attributes, final AnnotatedType<T> annotatedType) {
final BeanContext bc = findBeanContext(webBeansContext, clazz);
- final CdiEjbBean<T> bean = new OpenEJBBeanBuilder<T>(bc, webBeansContext, annotatedType).createBean(clazz, !annotatedType.isAnnotationPresent(Vetoed.class));
+ final CdiEjbBean<T> bean = new OpenEJBBeanBuilder<T>(bc, webBeansContext, annotatedType, attributes).createBean(clazz, !annotatedType.isAnnotationPresent(Vetoed.class));
bc.set(CdiEjbBean.class, bean);
bc.set(CurrentCreationalContext.class, new CurrentCreationalContext());
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
index 5a5b8da..0e0fd15 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/NewCdiEjbBean.java
@@ -18,6 +18,7 @@
package org.apache.openejb.cdi;
import org.apache.webbeans.annotation.NewLiteral;
+import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.NewBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
@@ -39,7 +40,9 @@ public class NewCdiEjbBean<T> extends CdiEjbBean<T> implements NewBean<T> {
private final String id;
public NewCdiEjbBean(final CdiEjbBean<T> that) {
- super(that.getBeanContext(), that.getWebBeansContext(), that.getBeanContext().getManagedClass(), that.getAnnotatedType(), new NewEjbInjectionTargetFactory<T>(that.getAnnotatedType(), that.getWebBeansContext(), that.getInjectionTarget()));
+ super(that.getBeanContext(), that.getWebBeansContext(), that.getBeanContext().getManagedClass(), that.getAnnotatedType(),
+ new NewEjbInjectionTargetFactory<T>(that.getAnnotatedType(), that.getWebBeansContext(), that.getInjectionTarget()),
+ new BeanAttributesImpl<T>(that));
this.id = that.getId() + "NewBean";
initInternals();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanBuilder.java
index 34cd8d5..1dabab0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBBeanBuilder.java
@@ -25,19 +25,21 @@ import org.apache.webbeans.ejb.common.component.EjbBeanBuilder;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanAttributes;
import java.util.List;
public class OpenEJBBeanBuilder<A> extends EjbBeanBuilder<A, CdiEjbBean<A>> {
private final BeanContext beanContext;
- public OpenEJBBeanBuilder(final BeanContext bc, final WebBeansContext webBeansContext, final AnnotatedType<A> annotatedType) {
- super(webBeansContext, annotatedType, BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(annotatedType).build());
+ public OpenEJBBeanBuilder(final BeanContext bc, final WebBeansContext webBeansContext, final AnnotatedType<A> annotatedType,
+ final BeanAttributes<A> attributes) {
+ super(webBeansContext, annotatedType, attributes);
this.beanContext = bc;
}
@Override
protected CdiEjbBean<A> createBean(final Class<A> beanClass, final boolean beanEnabled) {
- return new CdiEjbBean<A>(beanContext, webBeansContext, annotatedType);
+ return new CdiEjbBean<A>(beanContext, webBeansContext, annotatedType, beanAttributes);
}
@Override
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
index d4c9988..4f999ce 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/StereotypeTest.java
@@ -46,7 +46,7 @@ public class StereotypeTest {
@Test
public void assertVehicleInjected() {
- assertEquals("the fatest", journey.vehicle());
+ assertEquals("the fastest", journey.vehicle());
}
@Test
http://git-wip-us.apache.org/repos/asf/tomee/blob/12274a4f/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
index 639d1fd..ae27fc4 100644
--- a/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
+++ b/examples/cdi-alternative-and-stereotypes/src/test/java/org/superbiz/cdi/stereotype/SuperCar.java
@@ -22,6 +22,6 @@ public class SuperCar implements Vehicle {
@Override
public String name() {
- return "the fatest";
+ return "the fastest";
}
}
[3/3] tomee git commit: trying to fake an url if we dont have it
Posted by rm...@apache.org.
trying to fake an url if we dont have it
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/27bdf668
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/27bdf668
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/27bdf668
Branch: refs/heads/develop
Commit: 27bdf6688bef03c1a48faddf712e15bb985ba670
Parents: 50c9484
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 22 18:54:47 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 22 18:54:47 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/27bdf668/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index c004e6c..6462f05 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -469,6 +469,8 @@ public class ReadDescriptors implements DynamicDeployer {
checkDuplicatedByBeansXml(beans, beans);
if (UrlSource.class.isInstance(data)) {
beans.setUri(UrlSource.class.cast(data).getUrl().toExternalForm());
+ } else {
+ beans.setUri("jar:file://" + ejbModule.getModuleId() + "!/META-INF/beans.xml");
}
ejbModule.setBeans(beans);
} catch (final IOException e) {
[2/3] tomee git commit: if we have the beans.xml url keep it and use
it since that's a key in OWB processing - EJBContainer case
Posted by rm...@apache.org.
if we have the beans.xml url keep it and use it since that's a key in OWB processing - EJBContainer case
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/50c94847
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/50c94847
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/50c94847
Branch: refs/heads/develop
Commit: 50c948470149d3f30eb4fa87bcd6d813fd29ae83
Parents: 12274a4
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 22 18:51:26 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 22 18:51:26 2014 +0100
----------------------------------------------------------------------
.../org/apache/openejb/config/AnnotationDeployer.java | 10 +++++++---
.../java/org/apache/openejb/config/ReadDescriptors.java | 3 +++
.../src/main/java/org/apache/openejb/jee/Beans.java | 11 +++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/50c94847/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 458f513..cb03bb9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -1287,7 +1287,7 @@ public class AnnotationDeployer implements DynamicDeployer {
if (beans != null) {
managedClasses = beans.getManagedClasses();
- getBeanClasses(finder, managedClasses, beans.getNotManagedClasses());
+ getBeanClasses(beans.getUri(), finder, managedClasses, beans.getNotManagedClasses());
// passing jar location to be able to manage maven classes/test-classes which have the same moduleId
String id = ejbModule.getModuleId();
@@ -1618,7 +1618,7 @@ public class AnnotationDeployer implements DynamicDeployer {
return name != null && name.length() != 0;
}
- private void getBeanClasses(final IAnnotationFinder finder, final Map<URL, List<String>> classes, final Map<URL, List<String>> notManaged) {
+ private void getBeanClasses(final String uri, final IAnnotationFinder finder, final Map<URL, List<String>> classes, final Map<URL, List<String>> notManaged) {
// What we're hoping in this method is to get lucky and find
// that our 'finder' instances is an AnnotationFinder that is
@@ -1637,7 +1637,11 @@ public class AnnotationDeployer implements DynamicDeployer {
final Archive archive = annotationFinder.getArchive();
if (!WebappAggregatedArchive.class.isInstance(archive)) {
- classes.put(null, annotationFinder.getAnnotatedClassNames());
+ try {
+ classes.put(uri == null ? null : new URL(uri), annotationFinder.getAnnotatedClassNames());
+ } catch (final MalformedURLException e) {
+ throw new IllegalStateException(e);
+ }
return;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/50c94847/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index 456a2f9..c004e6c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -467,6 +467,9 @@ public class ReadDescriptors implements DynamicDeployer {
try {
final Beans beans = readBeans(data.get());
checkDuplicatedByBeansXml(beans, beans);
+ if (UrlSource.class.isInstance(data)) {
+ beans.setUri(UrlSource.class.cast(data).getUrl().toExternalForm());
+ }
ejbModule.setBeans(beans);
} catch (final IOException e) {
throw new OpenEJBException(e);
http://git-wip-us.apache.org/repos/asf/tomee/blob/50c94847/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
index 2142ab5..843fdde 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Beans.java
@@ -100,6 +100,17 @@ public class Beans {
@XmlElement
protected Scan scan;
+ @XmlTransient
+ private String uri;
+
+ public String getUri() {
+ return uri;
+ }
+
+ public void setUri(final String uri) {
+ this.uri = uri;
+ }
+
public Scan getScan() {
if (scan == null) {
scan = new Scan();