You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/11/20 22:36:25 UTC
[aries-cdi] branch rotty3000/eliminate-double-start updated: an
initial patch to use OWB
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch rotty3000/eliminate-double-start
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/7b7cf18d7dbf8ef7973f982242fe1238a41337ee
The following commit(s) were added to refs/heads/rotty3000/eliminate-double-start by this push:
new 7b7cf18 an initial patch to use OWB
7b7cf18 is described below
commit 7b7cf18d7dbf8ef7973f982242fe1238a41337ee
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 17:34:33 2019 -0500
an initial patch to use OWB
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.gitignore | 2 +
cdi-bom/pom.xml | 18 ++-
cdi-executable/executable.bndrun | 16 ++-
cdi-extender/pom.xml | 4 +-
.../cdi/container/internal/bean/ReferenceBean.java | 21 +---
.../internal/container/CdiScannerService.java | 62 ++++++++++
.../internal/container/ConfigurationListener.java | 1 -
.../internal/container/ContainerBootstrap.java | 131 +++++++++++++-------
.../internal/container/ContainerDeployment.java | 66 ----------
.../container/ContainerDeploymentArchive.java | 84 -------------
.../internal/container/ContainerEnvironment.java | 43 -------
.../internal/container/ContainerState.java | 16 +--
.../internal/container/ExtensionMetadata.java | 41 -------
.../internal/container/MarkedInjectionPoint.java | 58 ---------
.../internal/container/RuntimeExtension.java | 49 ++++----
.../internal/loader/BundleClassLoader.java | 18 ++-
.../internal/loader/BundleResourcesLoader.java | 136 ---------------------
.../cdi/container/internal/model/BeansModel.java | 17 +--
.../internal/model/ComponentPropertiesModel.java | 3 +-
.../cdi/container/internal/util/Annotates.java | 10 +-
.../container/internal/phase/TemplatesTests.java | 10 +-
.../container/test/MockBeanDeploymentArchive.java | 69 -----------
.../aries/cdi/container/test/MockCdiContainer.java | 89 --------------
.../cdi/container/test/MockInjectionPoint.java | 2 -
.../apache/aries/cdi/container/test/TestUtil.java | 10 +-
cdi-extension-el-jsp/pom.xml | 4 +-
.../aries/cdi/extension/el/jsp/ELJSPExtension.java | 9 --
cdi-extension-http/pom.xml | 4 +-
.../aries/cdi/extension/http/HttpExtension.java | 10 +-
cdi-itests/itest.bndrun | 14 +--
.../apache/aries/cdi/test/cases/CdiBeanTests.java | 18 +--
.../apache/aries/cdi/test/tb13/CustomContext.java | 3 +
.../cdi/test/tb152_3_1_1a/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1b/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1c/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1d/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1e/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1f/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1g/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1h/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1i/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1j/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1k/ContextObserver.java | 3 +
.../cdi/test/tb152_3_1_1l/ContextObserver.java | 3 +
pom.xml | 49 ++------
45 files changed, 306 insertions(+), 817 deletions(-)
diff --git a/.gitignore b/.gitignore
index beef00d..dddad45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
.project
.settings
target
+*.iml
+.idea
diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 52b9365..646b754 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -112,15 +112,21 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>3.3.2.Final</version>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${owb.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <version>${weld.version}</version>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${owb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <version>4.15</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/cdi-executable/executable.bndrun b/cdi-executable/executable.bndrun
index 02b26d4..9f5200b 100644
--- a/cdi-executable/executable.bndrun
+++ b/cdi-executable/executable.bndrun
@@ -38,15 +38,14 @@
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
+ org.slf4j;version=1.7.28,\
+ org.slf4j.helpers;version=1.7.28,\
+ org.slf4j.spi;version=1.7.28,\
sun.misc
-runbundles: \
javax.ejb-api;version='[3.2.0,3.2.1)',\
javax.transaction-api;version='[1.2.0,1.2.1)',\
- jboss-classfilewriter;version='[1.2.3,1.2.4)',\
org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.http;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extra;version='[1.0.3,1.0.4)',\
@@ -62,8 +61,13 @@
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
- org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
- org.jboss.weld.osgi-bundle;version='[3.0.5,3.0.6)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)',\
+ javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
+ org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
+ org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)'
\ No newline at end of file
diff --git a/cdi-extender/pom.xml b/cdi-extender/pom.xml
index 2e94114..13444e8 100644
--- a/cdi-extender/pom.xml
+++ b/cdi-extender/pom.xml
@@ -87,8 +87,8 @@
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
index c1ac4b8..c6d7a76 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
@@ -149,26 +149,7 @@ public class ReferenceBean implements Bean<Object> {
// TODO do we want to support decorators/interceptors on in-bound services one day???
// ==================================================================================
-
-// if (s == null) return null;
-//
-// List<javax.enterprise.inject.spi.Decorator<?>> decorators = _bm.resolveDecorators(
-// Collections.singleton(_template.serviceClass),
-// new Annotation[0]);
-//
-// if (decorators.isEmpty()) {
-// return s;
-// }
-//
-// org.jboss.weld.manager.BeanManagerImpl bmi =
-// ((org.jboss.weld.bean.builtin.BeanManagerProxy)_bm).delegate();
-// org.jboss.weld.injection.CurrentInjectionPoint cip = bmi.getServices().get(
-// org.jboss.weld.injection.CurrentInjectionPoint.class);
-// InjectionPoint ip = cip.peek();
-// return org.jboss.weld.util.Decorators.getOuterDelegate(
-// (Bean<S>)this, s, c, (Class<S>)_template.serviceClass,
-// (org.jboss.weld.injection.EmptyInjectionPoint.INSTANCE.equals(ip) ? null : ip),
-// bmi, decorators);
+// If so, use InterceptionFactory instead of doing it manually
}
@Override
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/CdiScannerService.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/CdiScannerService.java
new file mode 100644
index 0000000..f91bcb8
--- /dev/null
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/CdiScannerService.java
@@ -0,0 +1,62 @@
+package org.apache.aries.cdi.container.internal.container;
+
+import static java.util.Collections.*;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.webbeans.corespi.se.DefaultBDABeansXmlScanner;
+import org.apache.webbeans.spi.BDABeansXmlScanner;
+import org.apache.webbeans.spi.ScannerService;
+
+// todo: bda support
+@SuppressWarnings("deprecation")
+public class CdiScannerService implements ScannerService {
+ private final Set<Class<?>> classes;
+ private final Set<URL> beansXml;
+ private BDABeansXmlScanner bdaBeansXmlScanner = new DefaultBDABeansXmlScanner();
+
+ public CdiScannerService(final Set<Class<?>> beanClassNames,
+ final Collection<URL> beansXml) {
+ this.classes = beanClassNames;
+ this.beansXml = beansXml == null ? emptySet() : new HashSet<>(beansXml);
+ }
+
+ @Override
+ public void init(final Object object) {
+ // no-op
+ }
+
+ @Override
+ public void scan() {
+ // we already scanned
+ }
+
+ @Override
+ public void release() {
+ // no-op
+ }
+
+ @Override
+ public Set<URL> getBeanXmls() {
+ return beansXml;
+ }
+
+ @Override
+ public Set<Class<?>> getBeanClasses() {
+ return classes;
+ }
+
+ @Override
+ public boolean isBDABeansXmlScanningEnabled() {
+ return false;
+ }
+
+ @Override
+ public BDABeansXmlScanner getBDABeansXmlScanner() {
+ return bdaBeansXmlScanner;
+ }
+
+}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java
index 9a89301..494de1c 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java
@@ -29,7 +29,6 @@ import org.apache.aries.cdi.container.internal.util.Maps;
import org.apache.aries.cdi.container.internal.util.Predicates;
import org.apache.aries.cdi.container.internal.util.Syncro;
import org.apache.aries.cdi.container.internal.util.Throw;
-import org.jboss.weld.exceptions.IllegalArgumentException;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cdi.ConfigurationPolicy;
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
index c67a26e..b7b7870 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
@@ -14,23 +14,34 @@
package org.apache.aries.cdi.container.internal.container;
+import static java.util.stream.Collectors.*;
+
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.enterprise.inject.spi.Extension;
import org.apache.aries.cdi.container.internal.container.Op.Mode;
import org.apache.aries.cdi.container.internal.container.Op.Type;
-import org.apache.aries.cdi.container.internal.loader.BundleResourcesLoader;
import org.apache.aries.cdi.container.internal.model.ExtendedExtensionDTO;
import org.apache.aries.cdi.container.internal.model.FactoryComponent;
+import org.apache.aries.cdi.container.internal.model.OSGiBean;
import org.apache.aries.cdi.container.internal.model.SingleComponent;
import org.apache.aries.cdi.container.internal.util.Syncro;
-import org.jboss.weld.bootstrap.WeldBootstrap;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.weld.bootstrap.spi.Metadata;
-import org.jboss.weld.util.ServiceLoader;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.corespi.DefaultSingletonService;
+import org.apache.webbeans.corespi.se.DefaultApplicationBoundaryService;
+import org.apache.webbeans.portable.events.ExtensionLoader;
+import org.apache.webbeans.service.ClassLoaderProxyService;
+import org.apache.webbeans.spi.ApplicationBoundaryService;
+import org.apache.webbeans.spi.ContainerLifecycle;
+import org.apache.webbeans.spi.DefiningClassService;
+import org.apache.webbeans.spi.ScannerService;
import org.osgi.service.log.Logger;
public class ContainerBootstrap extends Phase {
@@ -54,7 +65,15 @@ public class ContainerBootstrap extends Phase {
try (Syncro syncro = _lock.open()) {
if (_bootstrap != null) {
_log.debug(l -> l.debug("CCR container bootstrap shutdown on {}", _bootstrap));
- _bootstrap.shutdown();
+ Thread currentThread = Thread.currentThread();
+ ClassLoader current = currentThread.getContextClassLoader();
+ try {
+ currentThread.setContextClassLoader(containerState.classLoader());
+ _bootstrap.getService(ContainerLifecycle.class).stopApplication(bundle().getBundleContext());
+ }
+ finally {
+ currentThread.setContextClassLoader(current);
+ }
_bootstrap = null;
}
@@ -88,58 +107,41 @@ public class ContainerBootstrap extends Phase {
return false;
}
- List<Metadata<Extension>> extensions = new CopyOnWriteArrayList<>();
-
- // Add the internal extensions
- extensions.add(
- new ExtensionMetadata(
- new BundleContextExtension(containerState.bundleContext()),
- containerState.id()));
- extensions.add(
- new ExtensionMetadata(
- new RuntimeExtension(containerState, _configurationBuilder, _singleBuilder, _factoryBuilder),
- containerState.id()));
- extensions.add(
- new ExtensionMetadata(
- new LoggerExtension(containerState),
- containerState.id()));
-
Thread currentThread = Thread.currentThread();
ClassLoader current = currentThread.getContextClassLoader();
- BundleResourcesLoader.Builder builder = new BundleResourcesLoader.Builder(containerState.bundle(), containerState.extenderBundle());
-
try {
currentThread.setContextClassLoader(containerState.classLoader());
- // Add extensions found from the bundle's class loader, such as those in the Bundle-ClassPath
- ServiceLoader.load(Extension.class, containerState.classLoader()).forEach(extensions::add);
+ List<Extension> extensions = getExtensions();
// Add external extensions
containerState.containerDTO().extensions.stream().map(
ExtendedExtensionDTO.class::cast
).map(
- e -> {
- builder.add(e.serviceReference.getBundle());
- return new ExtensionMetadata(e.extension.getService(), e.template.serviceFilter);
- }
+ e -> e.extension.getService()
).forEach(extensions::add);
- _bootstrap = new WeldBootstrap();
-
- BeanDeploymentArchive beanDeploymentArchive = new ContainerDeploymentArchive(
- builder.build(),
- containerState.id(),
- containerState.beansModel().getBeanClassNames(),
- containerState.beansModel().getBeansXml());
+ final Properties properties = getConfiguration();
+ final Map<Class<?>, Object> services = getServices(current);
+ _bootstrap = new WebBeansContext(services, properties) {
+ private final ExtensionLoader overridenExtensionLoader = new ExtensionLoader(this) {
+ @Override
+ public void loadExtensionServices() {
+ extensions.forEach(this::addExtension);
+ }
+ };
+
+ @Override
+ public ExtensionLoader getExtensionLoader() {
+ return overridenExtensionLoader;
+ }
+ };
- Deployment deployment = new ContainerDeployment(extensions, beanDeploymentArchive);
+ DefaultSingletonService.class.cast(WebBeansFinder.getSingletonService())
+ .register(currentThread.getContextClassLoader(), _bootstrap);
- _bootstrap.startExtensions(extensions);
- _bootstrap.startContainer(containerState.id(), new ContainerEnvironment(), deployment);
- _bootstrap.startInitialization();
- _bootstrap.deployBeans();
- _bootstrap.validateBeans();
- _bootstrap.endInitialization();
+ final ContainerLifecycle lifecycle = _bootstrap.getService(ContainerLifecycle.class);
+ lifecycle.startApplication(bundle().getBundleContext());
}
finally {
currentThread.setContextClassLoader(current);
@@ -149,13 +151,50 @@ public class ContainerBootstrap extends Phase {
}
}
+ protected Properties getConfiguration() {
+ final Properties properties = new Properties();
+ properties.setProperty(DefiningClassService.class.getName(), ClassLoaderProxyService.class.getName());
+ // todo: use bundle properties?
+ return properties;
+ }
+
+ protected Map<Class<?>, Object> getServices(final ClassLoader bundleNativeLoader) {
+ final Map<Class<?>, Object> services = new HashMap<>();
+ services.put(ApplicationBoundaryService.class, new DefaultApplicationBoundaryService() {
+ @Override
+ public ClassLoader getApplicationClassLoader() {
+ return containerState.classLoader();
+ }
+ });
+ services.put(ScannerService.class, new CdiScannerService(
+ containerState.beansModel().getBeanClassNames().stream()
+ .map(containerState.beansModel()::getOSGiBean)
+ .map(OSGiBean::getBeanClass)
+ .collect(toSet()),
+ containerState.beansModel().getBeansXml()));
+ return services;
+ }
+
@Override
public Op openOp() {
return Op.of(Mode.OPEN, Type.CONTAINER_BOOTSTRAP, containerState.id());
}
+ protected List<Extension> getExtensions() {
+ List<Extension> extensions = new CopyOnWriteArrayList<>();
+
+ // Add the internal extensions
+ extensions.add(new BundleContextExtension(containerState.bundleContext()));
+ extensions.add(new RuntimeExtension(containerState, _configurationBuilder, _singleBuilder, _factoryBuilder));
+ extensions.add(new LoggerExtension(containerState));
+
+ // Add extensions found from the bundle's class loader, such as those in the Bundle-ClassPath
+ ServiceLoader.load(Extension.class, containerState.classLoader()).forEach(extensions::add);
+
+ return extensions;
+ }
- private volatile WeldBootstrap _bootstrap;
+ private volatile WebBeansContext _bootstrap;
private final ConfigurationListener.Builder _configurationBuilder;
private final FactoryComponent.Builder _factoryBuilder;
private final SingleComponent.Builder _singleBuilder;
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeployment.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeployment.java
deleted file mode 100644
index 7e838a5..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeployment.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.container;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.enterprise.inject.spi.Extension;
-
-import org.jboss.weld.bootstrap.api.ServiceRegistry;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.CDI11Deployment;
-import org.jboss.weld.bootstrap.spi.Metadata;
-
-public class ContainerDeployment implements CDI11Deployment {
-
- public ContainerDeployment(Iterable<Metadata<Extension>> extensions, BeanDeploymentArchive beanDeploymentArchive) {
- _extensions = extensions;
- _beanDeploymentArchive = beanDeploymentArchive;
-
- _beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>();
- _beanDeploymentArchives.add(beanDeploymentArchive);
- }
-
- @Override
- public BeanDeploymentArchive getBeanDeploymentArchive(Class<?> beanClass) {
- return _beanDeploymentArchive;
- }
-
- @Override
- public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() {
- return _beanDeploymentArchives;
- }
-
- @Override
- public Iterable<Metadata<Extension>> getExtensions() {
- return _extensions;
- }
-
- @Override
- public ServiceRegistry getServices() {
- return _beanDeploymentArchive.getServices();
- }
-
- @Override
- public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> aClass) {
- return _beanDeploymentArchive;
- }
-
- private final BeanDeploymentArchive _beanDeploymentArchive;
- private final Collection<BeanDeploymentArchive> _beanDeploymentArchives;
- private final Iterable<Metadata<Extension>> _extensions;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java
deleted file mode 100644
index 4fbca9b..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.container;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.jboss.weld.bootstrap.api.ServiceRegistry;
-import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.BeansXml;
-import org.jboss.weld.bootstrap.spi.EEModuleDescriptor;
-import org.jboss.weld.bootstrap.spi.EEModuleDescriptor.ModuleType;
-import org.jboss.weld.bootstrap.spi.helpers.EEModuleDescriptorImpl;
-import org.jboss.weld.ejb.spi.EjbDescriptor;
-import org.jboss.weld.resources.spi.ResourceLoader;
-import org.jboss.weld.serialization.spi.ProxyServices;
-
-public class ContainerDeploymentArchive
- implements BeanDeploymentArchive {
-
- public <T extends ResourceLoader & ProxyServices> ContainerDeploymentArchive(
- T loader, String id, Collection<String> beanClassNames, BeansXml beansXml) {
-
- _id = id;
- _beanClassNames = beanClassNames;
- _beansXml = beansXml;
- _services = new SimpleServiceRegistry();
-
- if (loader != null) {
- _services.add(ResourceLoader.class, loader);
- _services.add(ProxyServices.class, loader);
- _services.add(EEModuleDescriptor.class, new EEModuleDescriptorImpl(id, ModuleType.WEB));
- }
- }
-
- @Override
- public Collection<String> getBeanClasses() {
- return _beanClassNames;
- }
-
- @Override
- public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() {
- return Collections.emptyList();
- }
-
- @Override
- public BeansXml getBeansXml() {
- return _beansXml;
- }
-
- @Override
- public Collection<EjbDescriptor<?>> getEjbs() {
- return Collections.emptyList();
- }
-
- @Override
- public String getId() {
- return _id;
- }
-
- @Override
- public ServiceRegistry getServices() {
- return _services;
- }
-
- private final Collection<String> _beanClassNames;
- private final BeansXml _beansXml;
- private final String _id;
- private final ServiceRegistry _services;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerEnvironment.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerEnvironment.java
deleted file mode 100644
index a968c32..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerEnvironment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.container;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.weld.bootstrap.api.Environment;
-import org.jboss.weld.bootstrap.api.Service;
-
-public class ContainerEnvironment implements Environment {
-
- public ContainerEnvironment() {
- _requiredBeanDeploymentArchiveServices = new HashSet<Class<? extends Service>>();
- _requiredDeploymentServices = new HashSet<Class<? extends Service>>();
- }
-
- @Override
- public Set<Class<? extends Service>> getRequiredBeanDeploymentArchiveServices() {
- return _requiredBeanDeploymentArchiveServices;
- }
-
- @Override
- public Set<Class<? extends Service>> getRequiredDeploymentServices() {
- return _requiredDeploymentServices;
- }
-
- private final Set<Class<? extends Service>> _requiredBeanDeploymentArchiveServices;
- private final Set<Class<? extends Service>> _requiredDeploymentServices;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java
index f04cb9e..287ec2a 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerState.java
@@ -30,21 +30,16 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
import org.apache.aries.cdi.container.internal.ChangeCount;
import org.apache.aries.cdi.container.internal.loader.BundleClassLoader;
-import org.apache.aries.cdi.container.internal.loader.BundleResourcesLoader;
import org.apache.aries.cdi.container.internal.model.BeansModel;
import org.apache.aries.cdi.container.internal.model.BeansModelBuilder;
import org.apache.aries.cdi.container.internal.model.ExtendedConfigurationTemplateDTO;
import org.apache.aries.cdi.container.internal.model.ExtendedExtensionTemplateDTO;
import org.apache.aries.cdi.container.internal.util.Logs;
import org.apache.aries.cdi.container.internal.util.Throw;
-import org.jboss.weld.resources.spi.ResourceLoader;
-import org.jboss.weld.serialization.spi.ProxyServices;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -71,10 +66,6 @@ import org.osgi.util.tracker.ServiceTracker;
public class ContainerState {
- public static final AnnotationLiteral<Any> ANY = new AnnotationLiteral<Any>() {
- private static final long serialVersionUID = 1L;
- };
-
public ContainerState(
Bundle bundle,
Bundle extenderBundle,
@@ -328,11 +319,6 @@ public class ContainerState {
_changeCount.incrementAndGet();
}
- @SuppressWarnings("unchecked")
- public <T extends ResourceLoader & ProxyServices> T loader() {
- return (T)new BundleResourcesLoader.Builder(_bundle, _extenderBundle).build();
- }
-
public PromiseFactory promiseFactory() {
return _promiseFactory;
}
@@ -392,7 +378,7 @@ public class ContainerState {
BundleCapability capability = bundleWire.getCapability();
Map<String, Object> attributes = capability.getAttributes();
String packageName = (String)attributes.get(PackageNamespace.PACKAGE_NAMESPACE);
- if (!packageName.startsWith("org.jboss.weld.")) {
+ if (!packageName.startsWith("org.apache.openwebbeans.")) {
continue;
}
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ExtensionMetadata.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ExtensionMetadata.java
deleted file mode 100644
index 7ae345c..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ExtensionMetadata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.container;
-
-import javax.enterprise.inject.spi.Extension;
-
-import org.jboss.weld.bootstrap.spi.Metadata;
-
-public class ExtensionMetadata implements Metadata<Extension> {
-
- public ExtensionMetadata(Extension extension, String location) {
- _extension = extension;
- _location = location;
- }
-
- @Override
- public Extension getValue() {
- return _extension;
- }
-
- @Override
- public String getLocation() {
- return _location;
- }
-
- private final Extension _extension;
- private final String _location;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/MarkedInjectionPoint.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/MarkedInjectionPoint.java
deleted file mode 100644
index 0433f2e..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/MarkedInjectionPoint.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.container;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.apache.aries.cdi.container.internal.util.Sets;
-import org.jboss.weld.injection.ForwardingInjectionPoint;
-
-public class MarkedInjectionPoint extends ForwardingInjectionPoint {
-
- public MarkedInjectionPoint(InjectionPoint injectionPoint) {
- _delegate = injectionPoint;
- _mark = Mark.Literal.from(counter.incrementAndGet());
- _qualifiers = Sets.hashSet(injectionPoint.getQualifiers(), _mark);
- }
-
- @Override
- protected InjectionPoint delegate() {
- return _delegate;
- }
-
- public InjectionPoint getDelegate() {
- return delegate();
- }
-
- public Mark getMark() {
- return _mark;
- }
-
- @Override
- public Set<Annotation> getQualifiers() {
- return _qualifiers;
- }
-
- private static final AtomicInteger counter = new AtomicInteger();
-
- private final InjectionPoint _delegate;
- private final Mark _mark;
- private final Set<Annotation> _qualifiers;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
index 697b6f6..0f68034 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.annotation.Priority;
@@ -182,10 +183,7 @@ public class RuntimeExtension implements Extension {
for (ActivationTemplateDTO at : _containerTemplate.activations) {
ExtendedActivationTemplateDTO extended = (ExtendedActivationTemplateDTO)at;
if (extended.declaringClass.equals(declaringClass) &&
- (((extended.producer == null) && (producer == null)) ||
- (extended.producer != null) &&
- (producer != null) &&
- Objects.equals(extended.producer.getJavaMember(), producer.getJavaMember()))) {
+ equals(extended.producer, producer)) {
activationTemplate = extended;
break;
@@ -210,6 +208,18 @@ public class RuntimeExtension implements Extension {
}
}
+ // Objects.equals(producer, producer1) is not expected to work so impl it as expected there
+ private boolean equals(AnnotatedMember<?> producerA, AnnotatedMember<?> producerB) {
+ if ((producerA == null) && (producerB == null)) return true;
+ if (!Objects.equals(producerA.getJavaMember(), producerB.getJavaMember())) {
+ return false;
+ }
+ if (!Objects.equals(producerA.getAnnotations(), producerB.getAnnotations())) {
+ return false;
+ }
+ return true;
+ }
+
void afterBeanDiscovery(@Observes AfterBeanDiscovery abd, BeanManager bm) {
abd.addContext(_containerState.componentContext());
@@ -238,6 +248,7 @@ public class RuntimeExtension implements Extension {
properties.put(CDIConstants.CDI_CONTAINER_ID, _containerState.id());
properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - BeanManager for " + _containerState.bundle());
properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+ properties.put(Constants.SERVICE_BUNDLEID, _containerState.bundle().getBundleId());
List<String> serviceTypes = new ArrayList<>();
@@ -292,7 +303,7 @@ public class RuntimeExtension implements Extension {
).findFirst().map(
ExtendedReferenceDTO.class::cast
).ifPresent(
- r -> bean.setReferenceDTO(r)
+ bean::setReferenceDTO
);
}
@@ -368,7 +379,7 @@ public class RuntimeExtension implements Extension {
return _containerState.submit(cl.openOp(), cl::open);
}
- private boolean matchConfiguration(OSGiBean osgiBean, ProcessInjectionPoint<?, ?> pip) {
+ private void processConfiguration(OSGiBean osgiBean, ProcessInjectionPoint<?, ?> pip) {
InjectionPoint injectionPoint = pip.getInjectionPoint();
Class<?> declaringClass = Annotates.declaringClass(injectionPoint.getAnnotated());
@@ -379,22 +390,18 @@ public class RuntimeExtension implements Extension {
injectionPoint.getQualifiers()
).build().toDTO();
- return osgiBean.getComponent().configurations.stream().map(
+ osgiBean.getComponent().configurations.stream().map(
t -> (ExtendedConfigurationTemplateDTO)t
).filter(
t -> current.equals(t)
- ).findFirst().map(
+ ).findFirst().ifPresent(
t -> {
- MarkedInjectionPoint markedInjectionPoint = new MarkedInjectionPoint(injectionPoint);
+ final Mark mark = Mark.Literal.from(MARK_IP_COUNTER.incrementAndGet());
+ pip.configureInjectionPoint().addQualifiers(mark);
- pip.setInjectionPoint(markedInjectionPoint);
-
- t.bean.setInjectionPoint(injectionPoint);
- t.bean.setMark(markedInjectionPoint.getMark());
-
- return true;
+ t.bean.setMark(mark);
}
- ).orElse(false);
+ );
}
private boolean matchReference(OSGiBean osgiBean, ProcessInjectionPoint<?, ?> pip) {
@@ -414,11 +421,10 @@ public class RuntimeExtension implements Extension {
t -> current.equals(t)
).findFirst().map(
t -> {
- MarkedInjectionPoint markedInjectionPoint = new MarkedInjectionPoint(injectionPoint);
-
- pip.setInjectionPoint(markedInjectionPoint);
+ final Mark mark = Mark.Literal.from(MARK_IP_COUNTER.incrementAndGet());
+ pip.configureInjectionPoint().addQualifier(mark);
- t.bean.setMark(markedInjectionPoint.getMark());
+ t.bean.setMark(mark);
_log.debug(l -> l.debug("CCR maping InjectionPoint {} to reference template {}", injectionPoint, t));
@@ -449,7 +455,7 @@ public class RuntimeExtension implements Extension {
}
if (componentProperties != null) {
- matchConfiguration(osgiBean, pip);
+ processConfiguration(osgiBean, pip);
}
}
@@ -568,4 +574,5 @@ public class RuntimeExtension implements Extension {
private final List<ServiceRegistration<?>> _registrations = new CopyOnWriteArrayList<>();
private final SingleComponent.Builder _singleBuilder;
+ private static final AtomicInteger MARK_IP_COUNTER = new AtomicInteger();
}
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleClassLoader.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleClassLoader.java
index 9246c04..394d7fd 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleClassLoader.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleClassLoader.java
@@ -16,19 +16,17 @@ package org.apache.aries.cdi.container.internal.loader;
import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Collections;
import java.util.Enumeration;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.webbeans.config.WebBeansContext;
import org.osgi.framework.Bundle;
-public class BundleClassLoader extends URLClassLoader {
+public class BundleClassLoader extends ClassLoader {
public BundleClassLoader(Bundle[] bundles) {
- super(new URL[0]);
-
if (bundles.length == 0) {
throw new IllegalArgumentException(
"At least one bundle is required");
@@ -64,6 +62,13 @@ public class BundleClassLoader extends URLClassLoader {
}
}
+ if (name != null && name.startsWith("META-INF/openwebbeans/")) { // fallback
+ try {
+ return WebBeansContext.class.getClassLoader().getResources(name);
+ }
+ catch (IOException e) {
+ }
+ }
return Collections.emptyEnumeration();
}
@@ -94,6 +99,11 @@ public class BundleClassLoader extends URLClassLoader {
continue;
}
}
+ if (name != null) {
+ if (name.startsWith("org.apache.webbeans.") || name.startsWith("sun.misc.")) {
+ return WebBeansContext.class.getClassLoader().loadClass(name);
+ }
+ }
throw new ClassNotFoundException(name);
}
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleResourcesLoader.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleResourcesLoader.java
deleted file mode 100644
index 621ac34..0000000
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader/BundleResourcesLoader.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.internal.loader;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.weld.resources.spi.ResourceLoader;
-import org.jboss.weld.resources.spi.ResourceLoadingException;
-import org.jboss.weld.serialization.spi.ProxyServices;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.namespace.PackageNamespace;
-import org.osgi.framework.wiring.BundleCapability;
-import org.osgi.framework.wiring.BundleWire;
-import org.osgi.framework.wiring.BundleWiring;
-
-public class BundleResourcesLoader implements ProxyServices, ResourceLoader {
-
- public static class Builder {
-
- public Builder(Bundle bundle, Bundle extenderBundle) {
- this.bundle = bundle;
- this.extenderBundle = extenderBundle;
- }
-
- public Builder add(Bundle bundle) {
- additionalBundles.add(bundle);
- return this;
- }
-
- public BundleResourcesLoader build() {
- return new BundleResourcesLoader(bundle, extenderBundle, additionalBundles);
- }
-
- private final Bundle bundle;
- private final Bundle extenderBundle;
- private final List<Bundle> additionalBundles = new ArrayList<>();
- }
-
- BundleResourcesLoader(Bundle bundle, Bundle extenderBundle, List<Bundle> additionalBundles) {
- BundleWiring extenderWiring = extenderBundle.adapt(BundleWiring.class);
-
- List<Bundle> bundles = new ArrayList<>();
-
- bundles.add(bundle);
- bundles.add(extenderBundle);
-
- List<BundleWire> requiredWires = extenderWiring.getRequiredWires(PackageNamespace.PACKAGE_NAMESPACE);
-
- for (BundleWire bundleWire : requiredWires) {
- BundleCapability capability = bundleWire.getCapability();
- Map<String, Object> attributes = capability.getAttributes();
- String packageName = (String)attributes.get(PackageNamespace.PACKAGE_NAMESPACE);
- if (!packageName.startsWith("org.jboss.weld.")) {
- continue;
- }
-
- Bundle wireBundle = bundleWire.getProvider().getBundle();
- if (!bundles.contains(wireBundle)) {
- bundles.add(wireBundle);
- }
- }
-
- bundles.addAll(additionalBundles);
-
- _classLoader = new BundleClassLoader(bundles.toArray(new Bundle[0]));
- }
-
-
- @Override
- public void cleanup() {
- }
-
- @Override
- public Class<?> classForName(String className) {
- try {
- return _classLoader.loadClass(className);
- }
- catch (ClassNotFoundException e) {
- throw new ResourceLoadingException(ERROR_LOADING_CLASS + className, e);
- }
- catch (LinkageError e) {
- throw new ResourceLoadingException(ERROR_LOADING_CLASS + className, e);
- }
- catch (TypeNotPresentException e) {
- throw new ResourceLoadingException(ERROR_LOADING_CLASS + className, e);
- }
- }
-
- @Override
- public ClassLoader getClassLoader(Class<?> proxiedBeanType) {
- return _classLoader;
- }
-
- @Override
- public Class<?> loadBeanClass(String className) {
- return classForName(className);
- }
-
- @Override
- public URL getResource(String name) {
- return _classLoader.getResource(name);
- }
-
- @Override
- public Collection<URL> getResources(String name) {
- try {
- return Collections.list(_classLoader.getResources(name));
- }
- catch (IOException e) {
- return Collections.emptyList();
- }
- }
-
- private static final String ERROR_LOADING_CLASS = "Error loading class ";
-
- private final ClassLoader _classLoader;
-
-}
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModel.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModel.java
index 4933d14..f39a5ff 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModel.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModel.java
@@ -18,9 +18,6 @@ import java.net.URL;
import java.util.Collection;
import java.util.Map;
-import org.jboss.weld.bootstrap.spi.BeansXml;
-import org.jboss.weld.xml.BeansXmlParser;
-
public class BeansModel {
public BeansModel(
@@ -28,22 +25,14 @@ public class BeansModel {
Collection<URL> beanDescriptorURLs) {
_beans = beans;
-
- BeansXml beansXml = BeansXml.EMPTY_BEANS_XML;
-
- if (!beanDescriptorURLs.isEmpty()) {
- BeansXmlParser beansXmlParser = new BeansXmlParser();
- beansXml = beansXmlParser.parse(beanDescriptorURLs);
- }
-
- _beansXml = beansXml;
+ _beansXml = beanDescriptorURLs;
}
public Collection<String> getBeanClassNames() {
return _beans.keySet();
}
- public BeansXml getBeansXml() {
+ public Collection<URL> getBeansXml() {
return _beansXml;
}
@@ -60,6 +49,6 @@ public class BeansModel {
}
private final Map<String, OSGiBean> _beans;
- private final BeansXml _beansXml;
+ private final Collection<URL> _beansXml;
}
\ No newline at end of file
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java
index 59c691d..2b7deb3 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ComponentPropertiesModel.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.osgi.service.cdi.ConfigurationPolicy;
import org.osgi.service.cdi.MaximumCardinality;
import org.osgi.service.cdi.annotations.PID;
-import org.osgi.service.cdi.runtime.dto.template.ConfigurationTemplateDTO;
public class ComponentPropertiesModel {
@@ -98,7 +97,7 @@ public class ComponentPropertiesModel {
return _injectionPointType;
}
- public ConfigurationTemplateDTO toDTO() {
+ public ExtendedConfigurationTemplateDTO toDTO() {
ExtendedConfigurationTemplateDTO dto = new ExtendedConfigurationTemplateDTO();
dto.beanClass = _beanClass;
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
index e4facbe..e2b7035 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Annotates.java
@@ -14,6 +14,8 @@
package org.apache.aries.cdi.container.internal.util;
+import static org.apache.aries.cdi.container.internal.util.Reflection.*;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Executable;
import java.lang.reflect.Parameter;
@@ -46,7 +48,6 @@ import javax.inject.Named;
import javax.inject.Qualifier;
import javax.inject.Scope;
-import org.jboss.weld.util.Types;
import org.osgi.service.cdi.ServiceScope;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.ServiceInstance;
@@ -94,8 +95,7 @@ public class Annotates {
}
else if (instance instanceof Annotated) {
Annotated annotated = (Annotated)instance;
-
- declaringClass = Types.getRawTypes(new Type[] {annotated.getBaseType()})[0];
+ declaringClass = getRawType(annotated.getBaseType());
}
else if (instance instanceof ProcessManagedBean) {
ProcessManagedBean<?> bean = (ProcessManagedBean<?>)instance;
@@ -256,9 +256,7 @@ public class Annotates {
}
public static List<String> serviceClassNames(Annotated annotated) {
- return serviceClasses(annotated).stream().map(
- st -> st.getName()
- ).sorted().collect(Collectors.toList());
+ return serviceClasses(annotated).stream().map(Class::getName).sorted().collect(Collectors.toList());
}
public static ServiceScope serviceScope(Annotated annotated) {
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java
index b4d4892..4e4b7fd 100644
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java
+++ b/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/TemplatesTests.java
@@ -14,10 +14,12 @@
package org.apache.aries.cdi.container.internal.phase;
+import static java.util.Collections.singletonList;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,7 +62,7 @@ public class TemplatesTests extends BaseCDIBundleTest {
assertNotNull(containerDTO.template);
List<ComponentTemplateDTO> components = TestUtil.sort(
- containerDTO.template.components, (a, b) -> a.name.compareTo(b.name));
+ containerDTO.template.components, Comparator.comparing(a -> a.name));
assertEquals(2, components.size());
{
@@ -134,7 +136,7 @@ public class TemplatesTests extends BaseCDIBundleTest {
assertNotNull(containerDTO.template);
List<ComponentTemplateDTO> components = TestUtil.sort(
- containerDTO.template.components, (a, b) -> a.name.compareTo(b.name));
+ containerDTO.template.components, Comparator.comparing(a -> a.name));
assertEquals(3, components.size());
{
@@ -175,7 +177,7 @@ public class TemplatesTests extends BaseCDIBundleTest {
ActivationTemplateDTO at = ct.activations.get(0);
assertEquals(Maps.of(), at.properties);
assertEquals(ServiceScope.SINGLETON, at.scope);
- assertEquals(Arrays.asList("org.apache.aries.cdi.container.test.beans.Foo"), at.serviceClasses);
+ assertEquals(singletonList("org.apache.aries.cdi.container.test.beans.Foo"), at.serviceClasses);
}
assertEquals(2, ct.beans.size());
@@ -219,7 +221,7 @@ public class TemplatesTests extends BaseCDIBundleTest {
assertNotNull(containerDTO.template);
List<ComponentTemplateDTO> components = TestUtil.sort(
- containerDTO.template.components, (a, b) -> a.name.compareTo(b.name));
+ containerDTO.template.components, Comparator.comparing(a -> a.name));
assertEquals(3, components.size());
{ // component "barService"
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockBeanDeploymentArchive.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockBeanDeploymentArchive.java
deleted file mode 100644
index 0558319..0000000
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockBeanDeploymentArchive.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.test;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.weld.bootstrap.api.ServiceRegistry;
-import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.BeansXml;
-import org.jboss.weld.ejb.spi.EjbDescriptor;
-
-public class MockBeanDeploymentArchive implements BeanDeploymentArchive {
-
- public MockBeanDeploymentArchive(String id, String... beanClasses) {
- _id = id;
- _beanClasses = Arrays.asList(beanClasses);
- }
-
- @Override
- public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() {
- return Collections.emptyList();
- }
-
- @Override
- public Collection<String> getBeanClasses() {
- return _beanClasses;
- }
-
- @Override
- public BeansXml getBeansXml() {
- return BeansXml.EMPTY_BEANS_XML;
- }
-
- @Override
- public Collection<EjbDescriptor<?>> getEjbs() {
- return Collections.emptyList();
- }
-
- @Override
- public ServiceRegistry getServices() {
- return _services;
- }
-
- @Override
- public String getId() {
- return _id;
- }
-
- private final List<String> _beanClasses;
- private final String _id;
- private final ServiceRegistry _services = new SimpleServiceRegistry();
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockCdiContainer.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockCdiContainer.java
deleted file mode 100644
index 331b726..0000000
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockCdiContainer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.cdi.container.test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-
-import org.apache.aries.cdi.container.internal.container.ContainerDeployment;
-import org.apache.aries.cdi.container.internal.container.ContainerEnvironment;
-import org.jboss.weld.bootstrap.WeldBootstrap;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.bootstrap.spi.Deployment;
-import org.jboss.weld.bootstrap.spi.Metadata;
-import org.junit.Assert;
-
-public class MockCdiContainer implements AutoCloseable {
-
- public MockCdiContainer(String name, String... beanClasses) {
- this(name, Collections.emptyList(), beanClasses);
- }
-
- public MockCdiContainer(String name, List<Metadata<Extension>> extensions, String... beanClasses) {
- _bda = new MockBeanDeploymentArchive(name, beanClasses);
-
- Deployment deployment = new ContainerDeployment(extensions, _bda);
-
- WeldBootstrap bootstrap = new WeldBootstrap();
-
- bootstrap.startExtensions(extensions);
- bootstrap.startContainer(new ContainerEnvironment(), deployment);
- bootstrap.startInitialization();
- bootstrap.deployBeans();
- bootstrap.validateBeans();
- bootstrap.endInitialization();
-
- _bootstrap = bootstrap;
- }
-
- @Override
- public void close() {
- _bootstrap.shutdown();
- }
-
- public Bean<?> getBean(Class<?> clazz) {
- final BeanManager managerImpl = getBeanManager();
-
- Set<javax.enterprise.inject.spi.Bean<?>> beans =
- managerImpl.getBeans(clazz, Any.Literal.INSTANCE);
-
- Assert.assertFalse(beans.isEmpty());
-
- return managerImpl.resolve(beans);
- }
-
- public BeanManager getBeanManager() {
- if (_beanManager != null) {
- return _beanManager;
- }
-
- return _beanManager = _bootstrap.getManager(_bda);
- }
-
- public WeldBootstrap getBootstrap() {
- return _bootstrap;
- }
-
- private final BeanDeploymentArchive _bda;
- private BeanManager _beanManager;
- private final WeldBootstrap _bootstrap;
-
-}
\ No newline at end of file
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockInjectionPoint.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockInjectionPoint.java
index 413062b..edf0c55 100644
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockInjectionPoint.java
+++ b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockInjectionPoint.java
@@ -28,8 +28,6 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Qualifier;
-import org.jboss.weld.exceptions.IllegalArgumentException;
-
public class MockInjectionPoint implements InjectionPoint {
public MockInjectionPoint(AnnotatedElement annotatedElement) {
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
index 293a4e9..5da1cd3 100644
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
+++ b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
@@ -41,8 +41,6 @@ import org.apache.aries.cdi.container.internal.model.BeansModel;
import org.apache.aries.cdi.container.internal.util.Filters;
import org.apache.aries.cdi.container.internal.util.Logs;
import org.apache.aries.cdi.container.internal.util.Sfl4jLogger;
-import org.jboss.weld.resources.spi.ResourceLoader;
-import org.jboss.weld.serialization.spi.ProxyServices;
import org.mockito.stubbing.Answer;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -71,7 +69,7 @@ import org.osgi.util.tracker.ServiceTracker;
public class TestUtil {
public static <T extends Comparable<T>> List<T> sort(Collection<T> set) {
- return sort(set, (c1, c2) -> c1.getClass().getName().compareTo(c2.getClass().getName()));
+ return sort(set, Comparator.comparing(c -> c.getClass().getName()));
}
public static <T> List<T> sort(Collection<T> set, Comparator<T> comparator) {
@@ -126,12 +124,6 @@ public class TestUtil {
public BeansModel beansModel() {
return beansModel;
}
-
- @Override
- public <T extends ResourceLoader & ProxyServices> T loader() {
- return null;
- }
-
};
}
diff --git a/cdi-extension-el-jsp/pom.xml b/cdi-extension-el-jsp/pom.xml
index 4d72cb2..4408d58 100644
--- a/cdi-extension-el-jsp/pom.xml
+++ b/cdi-extension-el-jsp/pom.xml
@@ -89,8 +89,8 @@
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPExtension.java b/cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPExtension.java
index 3e3b89f..af02d1d 100644
--- a/cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPExtension.java
+++ b/cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPExtension.java
@@ -41,7 +41,6 @@ import javax.servlet.ServletContextListener;
import javax.servlet.jsp.JspApplicationContext;
import javax.servlet.jsp.JspFactory;
-import org.jboss.weld.module.web.el.WeldELContextListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.wiring.BundleCapability;
@@ -78,14 +77,6 @@ public class ELJSPExtension implements Extension {
// Register the ELResolver with JSP
jspApplicationContext.addELResolver(beanManager.getELResolver());
-
- // Register ELContextListener with JSP
- try {
- jspApplicationContext.addELContextListener(new WeldELContextListener());
- }
- catch (Exception e) {
- servletContext.log("Failure registering ELContextListener", e);
- }
}
@Override
diff --git a/cdi-extension-http/pom.xml b/cdi-extension-http/pom.xml
index 0734bfd..fe6d88f 100644
--- a/cdi-extension-http/pom.xml
+++ b/cdi-extension-http/pom.xml
@@ -79,8 +79,8 @@
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java b/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
index 7aed15f..2506dcb 100644
--- a/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
+++ b/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
@@ -76,7 +76,7 @@ import org.apache.aries.cdi.extra.propertytypes.HttpWhiteboardServletName;
import org.apache.aries.cdi.extra.propertytypes.HttpWhiteboardServletPattern;
import org.apache.aries.cdi.extra.propertytypes.ServiceDescription;
import org.apache.aries.cdi.extra.propertytypes.ServiceRanking;
-import org.jboss.weld.module.web.servlet.WeldInitialListener;
+import org.apache.webbeans.servlet.WebBeansConfigurationListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.wiring.BundleCapability;
@@ -247,11 +247,11 @@ public class HttpExtension implements Extension {
properties.put(HTTP_WHITEBOARD_LISTENER, Boolean.TRUE.toString());
properties.put(SERVICE_RANKING, Integer.MAX_VALUE - 100);
- AnnotatedType<WeldInitialListener> annotatedType = beanManager.createAnnotatedType(WeldInitialListener.class);
- InjectionTargetFactory<WeldInitialListener> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType);
- Bean<WeldInitialListener> bean = beanManager.createBean(beanManager.createBeanAttributes(annotatedType), WeldInitialListener.class, injectionTargetFactory);
+ AnnotatedType<WebBeansConfigurationListener> annotatedType = beanManager.createAnnotatedType(WebBeansConfigurationListener.class);
+ InjectionTargetFactory<WebBeansConfigurationListener> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType);
+ Bean<WebBeansConfigurationListener> bean = beanManager.createBean(beanManager.createBeanAttributes(annotatedType), WebBeansConfigurationListener.class, injectionTargetFactory);
- WeldInitialListener initialListener = bean.create(beanManager.createCreationalContext(bean));
+ WebBeansConfigurationListener initialListener = bean.create(beanManager.createCreationalContext(bean));
_listenerRegistration = _bundle.getBundleContext().registerService(
LISTENER_CLASSES, new ListenerWrapper<>(initialListener), properties);
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/itest.bndrun
index 5d12cdf..a11fc78 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/itest.bndrun
@@ -24,8 +24,6 @@
-resolve.effective: resolve, active
-runrequires: \
- osgi.identity;filter:='(osgi.identity=javax.ejb-api)',\
- osgi.identity;filter:='(osgi.identity=javax.transaction-api)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jndi.core)',\
@@ -45,9 +43,6 @@
-runbundles: \
biz.aQute.junit;version='[4.3.1,4.3.2)',\
- javax.ejb-api;version='[3.2.0,3.2.1)',\
- javax.transaction-api;version='[1.2.0,1.2.1)',\
- jboss-classfilewriter;version='[1.2.3,1.2.4)',\
org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.http;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.jndi;version='[1.0.3,1.0.4)',\
@@ -71,8 +66,13 @@
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
- org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
- org.jboss.weld.osgi-bundle;version='[3.0.5,3.0.6)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)',\
+ javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
+ org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
+ org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)'
\ No newline at end of file
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
index debd60a..604f098 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
@@ -43,7 +43,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "ConstructorInjectedService");) {
+ "ConstructorInjectedService")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -57,7 +57,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<FieldInjectedReference, FieldInjectedReference> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
FieldInjectedReference.class.getName(),
- "FieldInjectedBundleScopedImpl");) {
+ "FieldInjectedBundleScopedImpl")) {
FieldInjectedReference fieldInjectedReference = tracker.waitForService(timeout);
@@ -77,7 +77,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<FieldInjectedReference, FieldInjectedReference> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
FieldInjectedReference.class.getName(),
- "FieldInjectedPrototypeScopedImpl");) {
+ "FieldInjectedPrototypeScopedImpl")) {
FieldInjectedReference fieldInjectedReference = tracker.waitForService(timeout);
@@ -97,7 +97,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "FieldInjectedService");) {
+ "FieldInjectedService")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -111,7 +111,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "MethodInjectedService");) {
+ "MethodInjectedService")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -140,7 +140,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "ServiceWithProperties");) {
+ "ServiceWithProperties")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -217,7 +217,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "Instance_ServiceProperties");) {
+ "Instance_ServiceProperties")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -235,7 +235,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "Instance_ServiceReference");) {
+ "Instance_ServiceReference")) {
BeanService beanService = tracker.waitForService(timeout);
@@ -252,7 +252,7 @@ public class CdiBeanTests extends AbstractTestCase {
try (CloseableTracker<BeanService, BeanService> tracker = track(
"(&(objectClass=%s)(objectClass=*.%s))",
BeanService.class.getName(),
- "Instance_Optional");) {
+ "Instance_Optional")) {
BeanService beanService = tracker.waitForService(timeout);
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb13/CustomContext.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb13/CustomContext.java
index 024714e..6da953a 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb13/CustomContext.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb13/CustomContext.java
@@ -30,6 +30,9 @@ import org.osgi.service.http.context.ServletContextHelper;
@HttpWhiteboardListener
@Service({ServletContextHelper.class, ServletContextListener.class})
public class CustomContext extends ServletContextHelper implements ServletContextListener {
+ protected CustomContext() {
+ // no-op: a normal scoped bean MUST have a default constructor to let container create a proxy
+ }
@Inject
public CustomContext(BundleContext bundleContext) {
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java
index ff2ec01..8f8c01b 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1a/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java
index 67888cc..55211e9 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1b/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java
index 77215f1..09b760b 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1c/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java
index 17a5347..b4e689d 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1d/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java
index b5f2167..610cb1c 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1e/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java
index da4882e..a7b7d7e 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1f/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/ContextObserver.java
index 9fbb33b..797e096 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1g/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1h/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1h/ContextObserver.java
index b746faf..c1fa84c 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1h/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1h/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1i/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1i/ContextObserver.java
index d98f7be..f1c1511 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1i/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1i/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1j/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1j/ContextObserver.java
index 9563ae1..96bbeff 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1j/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1j/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1k/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1k/ContextObserver.java
index 5dad7b7..56c9b12 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1k/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1k/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1l/ContextObserver.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1l/ContextObserver.java
index 29b0608..488e4e4 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1l/ContextObserver.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb152_3_1_1l/ContextObserver.java
@@ -33,6 +33,9 @@ import org.osgi.service.cdi.propertytypes.ServiceDescription;
@ApplicationScoped
@SuppressWarnings({"rawtypes", "unchecked"})
public class ContextObserver {
+ protected ContextObserver() {
+ this(null, null, null);
+ }
@Inject
public ContextObserver(
diff --git a/pom.xml b/pom.xml
index 2d32411..f354f53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
<jsp.version>2.0</jsp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
- <slf4j.version>1.7.25</slf4j.version>
- <weld.version>3.0.5.Final</weld.version>
+ <slf4j.version>1.7.28</slf4j.version>
+ <owb.version>2.0.13-SNAPSHOT</owb.version>
</properties>
<licenses>
@@ -111,43 +111,14 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <version>${weld.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.3_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.2_spec</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${owb.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>