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/12/01 16:44:57 UTC
[aries-cdi] branch master updated (4b4e773 -> ff6ed48)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git.
from 4b4e773 [maven-release-plugin] prepare for next development iteration
add c26aa4f implement annotated
add 3c41531 use our own logic for discover to avoid double CDI container startup
add d728ca7 spi
add e230e86 ignores
add 626b69d add spi to bom
add 744582b rename spi loader
add c3b157f missing spi package export
add dc9eb67 rewrite the extender not to use any particular CDI container impl
add fdc50ee add OpenWebBeans CDI container that uses the Aries CDI SPI
add a101776 always use a new classloader with each cdi container instance
add 1160239 add Weld CDI container that uses the Aries CDI SPI
add b0f5ac4 executables for each
add 353aff7 tweak jndi for better stability
add bbad287 these extensions are for weld for the moment
add e421358 run test suite on both
add fd67de0 readme updates
add 1e0219d test fixes
add 1980520 update tests
add f1bbce5 better SPI
add c9bb433 use release and widen blacklist of jobss APIs
add 7b78262 make sure @ApplicationScoped services are published on the right thread
add 874aaab use a base bndrun to avoid duplication
add e0b0c09 don't set a global resolve execution
add df6d321 mp-config extension
add ce32f13 mp-config test
add 3faa1ac update version
add 3c28c8a re-resolve
add 5de485b adding ContainerListener spi to enable to listen for container lifecycle portably
add b1247ac Merge pull request #4 from rmannibucau/rmannibucau/container-listener
new ff6ed48 Merge pull request #5 from apache/rotty3000/cdi-spi
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
README.md | 30 +-
cdi-bom/pom.xml | 24 +
.../{executable.bndrun => owb-executable.bndrun} | 43 +-
cdi-executable/pom.xml | 66 ++-
.../{executable.bndrun => weld-executable.bndrun} | 33 +-
cdi-extender/pom.xml | 16 +-
.../aries/cdi/container/internal/Activator.java | 87 ++--
.../internal/annotated/AnnotatedCallableImpl.java | 45 ++
.../AnnotatedConstructorImpl.java} | 22 +-
.../internal/annotated/AnnotatedFieldImpl.java | 24 +-
.../internal/annotated/AnnotatedImpl.java | 71 +++
.../internal/annotated/AnnotatedMemberImpl.java | 52 +++
.../internal/annotated/AnnotatedMethodImpl.java | 24 +-
.../internal/annotated/AnnotatedParameterImpl.java | 68 +++
.../internal/annotated/AnnotatedTypeImpl.java | 66 +++
.../internal/bean/ComponentPropertiesBean.java | 4 +-
.../cdi/container/internal/bean/ReferenceBean.java | 21 +-
.../cdi/container/internal/command/CDICommand.java | 75 +++-
.../container/internal/container/CDIBundle.java | 27 +-
.../internal/container/ConfigurationListener.java | 1 -
.../internal/container/ContainerBootstrap.java | 198 +++++---
.../internal/container/ContainerDiscovery.java | 56 ---
.../internal/container/ContainerState.java | 57 +--
.../container/internal/container/Discovery.java | 397 +++++++++++++++++
.../internal/container/DiscoveryExtension.java | 496 ---------------------
.../internal/container/MarkedInjectionPoint.java | 58 ---
.../aries/cdi/container/internal/container/Op.java | 2 +-
.../internal/container/RuntimeExtension.java | 91 ++--
.../internal/loader/BundleClassLoader.java | 120 ++++-
.../cdi/container/internal/model/BeansModel.java | 17 +-
.../internal/model/BeansModelBuilder.java | 5 +-
.../internal/model/ComponentPropertiesModel.java | 11 +-
.../model/ExtendedActivationTemplateDTO.java | 4 +-
.../model/ExtendedComponentTemplateDTO.java | 8 +-
.../container/internal/model/FactoryActivator.java | 2 +-
.../cdi/container/internal/model/OSGiBean.java | 6 +-
.../container/internal/model/ReferenceModel.java | 39 +-
.../container/internal/model/SingleActivator.java | 2 +-
.../container/internal/provider/CDIProvider.java | 40 +-
.../container/internal/spi/ContainerListener.java} | 10 +-
.../cdi/container/internal/util/Annotates.java | 91 +++-
.../aries/cdi/container/internal/util/Maps.java | 47 +-
.../cdi/container/internal/util/Reflection.java | 87 ++++
.../apache/aries/cdi/container/package-info.java | 9 +-
.../ReferenceModel_BeanServiceObjectsTest.java | 92 ++--
.../model/ReferenceModel_PropertiesTest.java | 48 +-
.../model/ReferenceModel_ServiceReferenceTest.java | 84 ++--
.../internal/model/ReferenceModel_ServiceTest.java | 88 ++--
.../internal/model/ReferenceModel_TupleTest.java | 68 +--
.../internal/phase/ContainerBootstrapTest.java | 21 +-
.../container/internal/phase/TemplatesTests.java | 14 +-
.../cdi/container/test/ContainerListenerTest.java | 217 +++++++++
.../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 | 1 +
cdi-extension-http/pom.xml | 1 +
.../aries/cdi/extension/http/HttpExtension.java | 137 ++----
.../aries/cdi/extension/jndi/JndiContext.java | 10 +-
.../aries/cdi/extension/jndi/JndiExtension.java | 6 +-
.../pom.xml | 89 +++-
.../apache/aries/cdi/extension/mp/config/BB.java | 60 +++
.../mp/config/StubConfigProviderResolver.java | 13 +-
.../cdi/extension/mp/config/StubExtension.java | 52 +++
.../cdi/extension/mp/config}/package-info.java | 17 +-
cdi-itests/base-itest.bndrun | 38 ++
cdi-itests/bnd.bnd | 3 +-
cdi-itests/bnd/{tb11.bnd => tb16.bnd} | 2 +-
cdi-itests/{itest.bndrun => owb-itest.bndrun} | 54 +--
cdi-itests/pom.xml | 76 +++-
.../aries/cdi/test/beans/BundleContextBean.java | 4 +
.../aries/cdi/test/beans/CdiEventObserver.java | 4 +
.../cdi/test/beans/IntegerServiceProvider.java | 4 +
.../org/apache/aries/cdi/test/beans/PojoImpl.java | 4 +
.../aries/cdi/test/cases/AbstractTestCase.java | 13 +-
.../apache/aries/cdi/test/cases/CdiBeanTests.java | 23 +-
.../aries/cdi/test/cases/ConfigurationTests.java | 84 +++-
.../apache/aries/cdi/test/cases/MpConfigTests.java | 48 ++
.../cdi/test/cases/OSGiBeanDescriptorTests.java | 3 +-
.../aries/cdi/test/tb11/OptionalReference_AS.java | 4 +
.../cdi/test/tb12/IntegerServiceProvider.java | 4 +
.../apache/aries/cdi/test/tb13/CustomContext.java | 3 +
.../org/apache/aries/cdi/test/tb152_3/One.java | 4 +
.../org/apache/aries/cdi/test/tb152_3_1/One.java | 4 +
.../cdi/test/tb152_3_1_1a/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1b/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1c/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1d/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1e/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1f/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1g/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1h/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1i/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1j/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1k/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1l/ContextObserver.java | 4 +
.../ConfiguredBean.java} | 22 +-
.../cdi/test/{tb11 => tb16}/package-info.java | 2 +-
.../java/org/apache/aries/cdi/test/tb3/Config.java | 2 +-
.../java/org/apache/aries/cdi/test/tb5/Config.java | 2 +-
.../java/org/apache/aries/cdi/test/tb7/Config.java | 2 +-
.../apache/aries/cdi/test/tb8/ContainerBean.java | 4 +
.../test/tb9/ContainerReferenceEventHandler.java | 4 +
cdi-itests/{itest.bndrun => weld-itest.bndrun} | 36 +-
{cdi-extension-http => cdi-owb}/pom.xml | 59 ++-
.../java/org/apache/aries/cdi/owb/Activator.java | 46 +-
.../apache/aries/cdi/owb/CdiScannerService.java | 62 +++
.../aries/cdi/owb/OSGiDefiningClassService.java | 73 +++
.../aries/cdi/owb/OWBCDIContainerInitializer.java | 288 ++++++++++++
.../cdi/owb/OWBCDIContainerInitializerFactory.java | 25 +-
.../cdi/owb/OsgiApplicationBoundaryService.java | 44 ++
.../org/apache/aries/cdi/owb}/package-info.java | 14 +-
.../aries/cdi/owb/web/UpdatableServletContext.java | 67 +++
.../org/apache/aries/cdi/owb/web/WebExtension.java | 231 ++++------
.../aries/cdi/owb/web/WebExtensionFactory.java | 6 +-
.../apache/aries/cdi/owb/web}/package-info.java | 6 +-
{cdi-extension-jndi => cdi-spi}/pom.xml | 46 +-
.../aries/cdi/spi/CDIContainerInitializer.java | 98 ++++
.../org/apache/aries/cdi/spi/loader/SpiLoader.java | 42 ++
.../apache/aries/cdi/spi/loader}/package-info.java | 6 +-
.../org/apache/aries/cdi/spi}/package-info.java | 6 +-
{cdi-extension-http => cdi-weld}/pom.xml | 68 ++-
.../java/org/apache/aries/cdi/weld/Activator.java | 21 +-
.../aries/cdi/weld}/BundleResourcesLoader.java | 39 +-
.../aries/cdi/weld}/ContainerDeployment.java | 2 +-
.../cdi/weld}/ContainerDeploymentArchive.java | 4 +-
.../aries/cdi/weld}/ContainerEnvironment.java | 2 +-
.../apache/aries/cdi/weld}/ExtensionMetadata.java | 2 +-
.../cdi/weld/WeldCDIContainerInitializer.java | 149 +++++++
.../weld/WeldCDIContainerInitializerFactory.java | 26 +-
.../org/apache/aries/cdi/weld}/package-info.java | 14 +-
pom.xml | 84 +---
134 files changed, 3808 insertions(+), 2065 deletions(-)
copy cdi-executable/{executable.bndrun => owb-executable.bndrun} (67%)
rename cdi-executable/{executable.bndrun => weld-executable.bndrun} (80%)
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedCallableImpl.java
copy cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/{container/CheckedCallback.java => annotated/AnnotatedConstructorImpl.java} (50%)
copy cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java => cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedFieldImpl.java (53%)
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedImpl.java
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedMemberImpl.java
copy cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/PojoImpl.java => cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedMethodImpl.java (52%)
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedParameterImpl.java
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/annotated/AnnotatedTypeImpl.java
delete mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDiscovery.java
create mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Discovery.java
delete mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/DiscoveryExtension.java
delete mode 100644 cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/MarkedInjectionPoint.java
copy cdi-extender/src/{test/java/org/apache/aries/cdi/container/test/beans/Baz.java => main/java/org/apache/aries/cdi/container/internal/spi/ContainerListener.java} (71%)
create mode 100644 cdi-extender/src/test/java/org/apache/aries/cdi/container/test/ContainerListenerTest.java
delete mode 100644 cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockBeanDeploymentArchive.java
delete mode 100644 cdi-extender/src/test/java/org/apache/aries/cdi/container/test/MockCdiContainer.java
copy {cdi-extension-jndi => cdi-extension-mp-config}/pom.xml (53%)
create mode 100644 cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/BB.java
copy cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java => cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubConfigProviderResolver.java (62%)
create mode 100644 cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubExtension.java
copy {cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi => cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config}/package-info.java (73%)
create mode 100644 cdi-itests/base-itest.bndrun
copy cdi-itests/bnd/{tb11.bnd => tb16.bnd} (91%)
copy cdi-itests/{itest.bndrun => owb-itest.bndrun} (64%)
create mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/MpConfigTests.java
copy cdi-itests/src/main/java/org/apache/aries/cdi/test/{tb152_3_1_1j/PrototypeSingle.java => tb16/ConfiguredBean.java} (65%)
copy cdi-itests/src/main/java/org/apache/aries/cdi/test/{tb11 => tb16}/package-info.java (93%)
rename cdi-itests/{itest.bndrun => weld-itest.bndrun} (78%)
copy {cdi-extension-http => cdi-owb}/pom.xml (68%)
copy cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java => cdi-owb/src/main/java/org/apache/aries/cdi/owb/Activator.java (51%)
create mode 100644 cdi-owb/src/main/java/org/apache/aries/cdi/owb/CdiScannerService.java
create mode 100644 cdi-owb/src/main/java/org/apache/aries/cdi/owb/OSGiDefiningClassService.java
create mode 100644 cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializer.java
copy cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java => cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializerFactory.java (52%)
create mode 100644 cdi-owb/src/main/java/org/apache/aries/cdi/owb/OsgiApplicationBoundaryService.java
copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/beans => cdi-owb/src/main/java/org/apache/aries/cdi/owb}/package-info.java (65%)
create mode 100644 cdi-owb/src/main/java/org/apache/aries/cdi/owb/web/UpdatableServletContext.java
copy cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java => cdi-owb/src/main/java/org/apache/aries/cdi/owb/web/WebExtension.java (61%)
copy cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtensionFactory.java => cdi-owb/src/main/java/org/apache/aries/cdi/owb/web/WebExtensionFactory.java (85%)
copy {cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http => cdi-owb/src/main/java/org/apache/aries/cdi/owb/web}/package-info.java (91%)
copy {cdi-extension-jndi => cdi-spi}/pom.xml (61%)
create mode 100644 cdi-spi/src/main/java/org/apache/aries/cdi/spi/CDIContainerInitializer.java
create mode 100644 cdi-spi/src/main/java/org/apache/aries/cdi/spi/loader/SpiLoader.java
copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/components => cdi-spi/src/main/java/org/apache/aries/cdi/spi/loader}/package-info.java (81%)
copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/components => cdi-spi/src/main/java/org/apache/aries/cdi/spi}/package-info.java (82%)
copy {cdi-extension-http => cdi-weld}/pom.xml (64%)
copy cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPActivator.java => cdi-weld/src/main/java/org/apache/aries/cdi/weld/Activator.java (66%)
rename {cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/loader => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/BundleResourcesLoader.java (73%)
rename {cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/ContainerDeployment.java (97%)
rename {cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/ContainerDeploymentArchive.java (96%)
rename {cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/ContainerEnvironment.java (95%)
rename {cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/ExtensionMetadata.java (94%)
create mode 100644 cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializer.java
copy cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtensionFactory.java => cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializerFactory.java (52%)
copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/beans => cdi-weld/src/main/java/org/apache/aries/cdi/weld}/package-info.java (65%)
[aries-cdi] 01/01: Merge pull request #5 from
apache/rotty3000/cdi-spi
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
commit ff6ed48ddbca34d42698dd52441fdef9784fceb1
Merge: 4b4e773 b1247ac
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Sun Dec 1 11:44:46 2019 -0500
Merge pull request #5 from apache/rotty3000/cdi-spi
Rotty3000/cdi spi
.gitignore | 2 +
README.md | 30 +-
cdi-bom/pom.xml | 24 +
.../{executable.bndrun => owb-executable.bndrun} | 43 +-
cdi-executable/pom.xml | 66 ++-
.../{executable.bndrun => weld-executable.bndrun} | 33 +-
cdi-extender/pom.xml | 16 +-
.../aries/cdi/container/internal/Activator.java | 87 ++--
.../internal/annotated/AnnotatedCallableImpl.java | 45 ++
.../annotated/AnnotatedConstructorImpl.java | 34 ++
.../internal/annotated/AnnotatedFieldImpl.java | 23 +-
.../internal/annotated/AnnotatedImpl.java | 71 +++
.../internal/annotated/AnnotatedMemberImpl.java | 52 +++
.../internal/annotated/AnnotatedMethodImpl.java | 23 +-
.../internal/annotated/AnnotatedParameterImpl.java | 68 +++
.../internal/annotated/AnnotatedTypeImpl.java | 66 +++
.../internal/bean/ComponentPropertiesBean.java | 4 +-
.../cdi/container/internal/bean/ReferenceBean.java | 21 +-
.../cdi/container/internal/command/CDICommand.java | 75 +++-
.../container/internal/container/CDIBundle.java | 27 +-
.../internal/container/ConfigurationListener.java | 1 -
.../internal/container/ContainerBootstrap.java | 198 +++++---
.../internal/container/ContainerDiscovery.java | 56 ---
.../internal/container/ContainerState.java | 57 +--
.../container/internal/container/Discovery.java | 397 +++++++++++++++++
.../internal/container/DiscoveryExtension.java | 496 ---------------------
.../internal/container/MarkedInjectionPoint.java | 58 ---
.../aries/cdi/container/internal/container/Op.java | 2 +-
.../internal/container/RuntimeExtension.java | 91 ++--
.../internal/loader/BundleClassLoader.java | 120 ++++-
.../cdi/container/internal/model/BeansModel.java | 17 +-
.../internal/model/BeansModelBuilder.java | 5 +-
.../internal/model/ComponentPropertiesModel.java | 11 +-
.../model/ExtendedActivationTemplateDTO.java | 4 +-
.../model/ExtendedComponentTemplateDTO.java | 8 +-
.../container/internal/model/FactoryActivator.java | 2 +-
.../cdi/container/internal/model/OSGiBean.java | 6 +-
.../container/internal/model/ReferenceModel.java | 39 +-
.../container/internal/model/SingleActivator.java | 2 +-
.../container/internal/provider/CDIProvider.java | 40 +-
.../Reflection.java => spi/ContainerListener.java} | 19 +-
.../cdi/container/internal/util/Annotates.java | 91 +++-
.../aries/cdi/container/internal/util/Maps.java | 47 +-
.../cdi/container/internal/util/Reflection.java | 87 ++++
.../apache/aries/cdi/container/package-info.java | 9 +-
.../ReferenceModel_BeanServiceObjectsTest.java | 92 ++--
.../model/ReferenceModel_PropertiesTest.java | 48 +-
.../model/ReferenceModel_ServiceReferenceTest.java | 84 ++--
.../internal/model/ReferenceModel_ServiceTest.java | 88 ++--
.../internal/model/ReferenceModel_TupleTest.java | 68 +--
.../internal/phase/ContainerBootstrapTest.java | 21 +-
.../container/internal/phase/TemplatesTests.java | 14 +-
.../cdi/container/test/ContainerListenerTest.java | 217 +++++++++
.../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 | 1 +
cdi-extension-http/pom.xml | 1 +
.../aries/cdi/extension/http/HttpExtension.java | 137 ++----
.../aries/cdi/extension/jndi/JndiContext.java | 10 +-
.../aries/cdi/extension/jndi/JndiExtension.java | 6 +-
.../pom.xml | 102 +++--
.../apache/aries/cdi/extension/mp/config/BB.java | 60 +++
.../mp/config/StubConfigProviderResolver.java | 16 +-
.../cdi/extension/mp/config/StubExtension.java | 52 +++
.../cdi/extension/mp/config/package-info.java | 39 ++
cdi-itests/base-itest.bndrun | 38 ++
cdi-itests/bnd.bnd | 3 +-
cdi-itests/bnd/tb16.bnd | 13 +
cdi-itests/{itest.bndrun => owb-itest.bndrun} | 54 +--
cdi-itests/pom.xml | 76 +++-
.../aries/cdi/test/beans/BundleContextBean.java | 4 +
.../aries/cdi/test/beans/CdiEventObserver.java | 4 +
.../cdi/test/beans/IntegerServiceProvider.java | 4 +
.../org/apache/aries/cdi/test/beans/PojoImpl.java | 4 +
.../aries/cdi/test/cases/AbstractTestCase.java | 13 +-
.../apache/aries/cdi/test/cases/CdiBeanTests.java | 23 +-
.../aries/cdi/test/cases/ConfigurationTests.java | 84 +++-
.../apache/aries/cdi/test/cases/MpConfigTests.java | 48 ++
.../cdi/test/cases/OSGiBeanDescriptorTests.java | 3 +-
.../aries/cdi/test/tb11/OptionalReference_AS.java | 4 +
.../cdi/test/tb12/IntegerServiceProvider.java | 4 +
.../apache/aries/cdi/test/tb13/CustomContext.java | 3 +
.../org/apache/aries/cdi/test/tb152_3/One.java | 4 +
.../org/apache/aries/cdi/test/tb152_3_1/One.java | 4 +
.../cdi/test/tb152_3_1_1a/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1b/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1c/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1d/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1e/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1f/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1g/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1h/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1i/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1j/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1k/ContextObserver.java | 4 +
.../cdi/test/tb152_3_1_1l/ContextObserver.java | 4 +
.../ConfiguredBean.java} | 24 +-
.../{tb3/Config.java => tb16/package-info.java} | 11 +-
.../java/org/apache/aries/cdi/test/tb3/Config.java | 2 +-
.../java/org/apache/aries/cdi/test/tb5/Config.java | 2 +-
.../java/org/apache/aries/cdi/test/tb7/Config.java | 2 +-
.../apache/aries/cdi/test/tb8/ContainerBean.java | 4 +
.../test/tb9/ContainerReferenceEventHandler.java | 4 +
cdi-itests/{itest.bndrun => weld-itest.bndrun} | 36 +-
{cdi-extension-http => cdi-owb}/pom.xml | 59 ++-
.../java/org/apache/aries/cdi/owb/Activator.java | 73 +++
.../apache/aries/cdi/owb/CdiScannerService.java | 62 +++
.../aries/cdi/owb/OSGiDefiningClassService.java | 73 +++
.../aries/cdi/owb/OWBCDIContainerInitializer.java | 288 ++++++++++++
.../cdi/owb/OWBCDIContainerInitializerFactory.java | 46 ++
.../cdi/owb/OsgiApplicationBoundaryService.java | 44 ++
.../org/apache/aries/cdi/owb/package-info.java | 20 +-
.../aries/cdi/owb/web/UpdatableServletContext.java | 67 +++
.../org/apache/aries/cdi/owb/web/WebExtension.java | 231 ++++------
.../aries/cdi/owb/web/WebExtensionFactory.java | 28 +-
.../org/apache/aries/cdi/owb/web/package-info.java | 45 ++
{cdi-extension-el-jsp => cdi-spi}/pom.xml | 61 +--
.../aries/cdi/spi/CDIContainerInitializer.java | 98 ++++
.../org/apache/aries/cdi/spi/loader/SpiLoader.java | 42 ++
.../apache/aries/cdi/spi/loader/package-info.java | 12 +-
.../org/apache/aries/cdi/spi/package-info.java | 12 +-
{cdi-extension-http => cdi-weld}/pom.xml | 68 ++-
.../java/org/apache/aries/cdi/weld/Activator.java | 53 +++
.../aries/cdi/weld}/BundleResourcesLoader.java | 39 +-
.../aries/cdi/weld}/ContainerDeployment.java | 2 +-
.../cdi/weld}/ContainerDeploymentArchive.java | 4 +-
.../aries/cdi/weld}/ContainerEnvironment.java | 2 +-
.../apache/aries/cdi/weld}/ExtensionMetadata.java | 2 +-
.../cdi/weld/WeldCDIContainerInitializer.java | 149 +++++++
.../weld/WeldCDIContainerInitializerFactory.java | 47 ++
.../org/apache/aries/cdi/weld/package-info.java | 20 +-
pom.xml | 84 +---
134 files changed, 4077 insertions(+), 2076 deletions(-)