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:58 UTC
[aries-cdi] 01/01: Merge pull request #5 from
apache/rotty3000/cdi-spi
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(-)