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/20 23:38:06 UTC

[aries-cdi] branch master updated (29c1804 -> f366a57)

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 29c1804  Merge pull request #31 from rotty3000/master
     new 4a26669  refactor mp-metrics, use new johnzon-osgi, remove ready
     new 9a50493  mp-jwt-auth
     new a981e22  jaxrs
     new ecf0dd6  use osgi-test to reduce boilerplate test code
     new 1ab64c5  reorganize experimental modules under experimental profile
     new 4e42b53  defined custom attribute "aries.cdi.extension.bean.classes" to be placed on
     new ce2b6fa  README details about custom Aries CDI features
     new f366a57  Merge pull request #32 from rotty3000/master

The 249 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:
 README.md                                          |  65 ++-
 cdi-bom/pom.xml                                    |  69 ++-
 cdi-build-tools/pom.xml                            |  33 +-
 .../cdi/build/tools/AddExtensionRequirement.java   |  62 ++-
 .../build/tools/RequirementsAnnotationRemover.java |  63 +++
 cdi-executable/base.bndrun                         |   4 +
 cdi-executable/owb-executable.bndrun               |   1 +
 cdi-executable/pom.xml                             |  43 +-
 cdi-executable/weld-executable.bndrun              |   1 +
 cdi-extender/pom.xml                               |  32 ++
 .../internal/container/BundleContextExtension.java |  11 +
 .../internal/container/ContainerBootstrap.java     |  37 +-
 .../internal/container/ContainerState.java         |  49 +-
 .../cdi/container/internal/util/Annotates.java     |  15 +-
 {cdi-itests => cdi-extension-jaxrs}/LICENSE        |   0
 {cdi-itests => cdi-extension-jaxrs}/NOTICE         |   0
 .../pom.xml                                        |  24 +-
 .../aries/cdi/extension/jaxrs/JaxrsActivator.java  |  15 +-
 .../cdi/extension/jaxrs/JaxrsCDIExtension.java     | 360 +++++++++++++
 .../cdi/extension/jaxrs/JaxrsExtensionFactory.java |   6 +-
 .../org/apache/aries/cdi/extension/jaxrs/Util.java |  61 +++
 .../aries/cdi/extension/jaxrs}/package-info.java   |  13 +-
 .../base-itest.bndrun                              |   9 +-
 .../bnd/tb01.bnd                                   |   2 +-
 .../logback.xml                                    |   0
 .../owb-itest.bndrun                               |  12 +-
 cdi-extension-mp-config/pom.xml                    | 268 +++++++++-
 .../{StubExtension.java => MPConfigExtension.java} |  26 +-
 .../cdi/extension/mp/config/package-info.java      |   8 +-
 .../cdi/extension/mp/config/test/BaseTestCase.java | 131 +++++
 .../extension/mp/config/test/MpConfigTests.java    |  30 +-
 .../extension/mp/config}/test/interfaces/Pojo.java |   2 +-
 .../mp/config/test/tb01}/ConfiguredBean.java       |   4 +-
 .../mp/config/test/tb01}/package-info.java         |   2 +-
 .../weld-itest.bndrun                              |  12 +-
 .../base-itest.bndrun                              |   9 +-
 .../bnd/tb01.bnd                                   |  23 +-
 cdi-extension-mp-jwt-auth/bnd/tb01.properties      |  36 ++
 .../logback.xml                                    |   0
 .../owb-itest.bndrun                               |  24 +-
 cdi-extension-mp-jwt-auth/pom.xml                  | 558 +++++++++++++++++++
 .../cdi/extension/mp/jwt/MPJwtAuthExtension.java   | 348 ++++++++++++
 .../aries/cdi/extension/mp/jwt/package-info.java   |  62 +++
 .../cdi/extension/mp/jwt/test/BaseTestCase.java    | 129 +++++
 .../cdi/extension/mp/jwt/test/CookieTest.java      |  59 +++
 .../extension/mp/jwt/test/HttpBaseTestCase.java    |  86 +++
 .../cdi/extension/mp/jwt/test/JaxRsAsyncTest.java  |  68 +++
 .../extension/mp/jwt/test/JaxrsBaseTestCase.java   |  50 ++
 .../cdi/extension/mp/jwt/test/MpJwtAuthTests.java  |  39 ++
 .../mp/jwt/test/PreProvidedTokenTest.java          |  54 ++
 .../extension/mp/jwt/test/tb01/AsyncEndpoint.java  |  87 +++
 .../mp/jwt/test/tb01/PassthroughEndpoint.java      |  39 ++
 .../extension/mp/jwt/test/tb01/RunAsFilter.java    |  66 +++
 .../extension/mp/jwt/test/tb01/TCKApplication.java |  23 +-
 .../extension/mp/jwt/test/tb01/TokenInspector.java |  40 ++
 .../extension/mp/jwt/test/tb01}/package-info.java  |   2 +-
 .../weld-itest.bndrun                              |  24 +-
 .../base-itest.bndrun                              |   9 +-
 .../bnd/tb01.bnd                                   |   2 +-
 .../logback.xml                                    |   0
 .../owb-itest.bndrun                               |  25 +-
 cdi-extension-mp-metrics/pom.xml                   | 305 ++++++++++-
 ...{StubExtension.java => MPMetricsExtension.java} |  80 +--
 .../cdi/extension/mp/metrics/StubJsonProvider.java |  26 -
 .../cdi/extension/mp/metrics/package-info.java     |  13 +-
 .../extension/mp/metrics/test/BaseTestCase.java    | 129 +++++
 .../mp/metrics/test/HttpBaseTestCase.java          |  86 +++
 .../mp/metrics/test/JaxrsBaseTestCase.java         |  50 ++
 .../extension/mp/metrics/test/MpMetricsTests.java  |  59 +++
 .../mp/metrics}/test/interfaces/Pojo.java          |   2 +-
 .../cdi/extension/mp/metrics/test/tb01}/A.java     |   4 +-
 .../weld-itest.bndrun                              |  23 +-
 cdi-extension-servlet-common/pom.xml               |   5 +
 .../servlet/common/WebFilterProcessor.java         |  56 +-
 .../servlet/common/WebListenerProcessor.java       |  83 ++-
 .../servlet/common/WebServletProcessor.java        |  62 ++-
 .../extension/servlet/owb/ServletActivator.java    |   5 +-
 .../cdi/extension/servlet/owb/package-info.java    |  12 +-
 cdi-extension-servlet-weld/pom.xml                 |   2 +-
 .../extension/servlet/weld/ServletActivator.java   |   5 +-
 .../cdi/extension/servlet/weld/package-info.java   |  12 +-
 {cdi-spi => cdi-extension-spi}/pom.xml             |  19 +-
 .../aries/cdi/extension/spi/adapt/Adapted.java     |  99 ++++
 .../cdi/extension/spi/adapt}/package-info.java     |   2 +-
 .../extension/spi/annotation/AdaptedService.java   |  72 +++
 .../extension/spi/annotation}/package-info.java    |   2 +-
 cdi-extra/pom.xml                                  |  17 +-
 .../aries/cdi/extra/RequireCDIExtension.java       |  35 +-
 .../cdi/extra/propertytypes/JSONRequired.java      |   3 +-
 cdi-itests/base-itest.bndrun                       |   5 +-
 cdi-itests/bnd.bnd                                 |   3 +-
 cdi-itests/bnd/tb16.bnd                            |  13 -
 cdi-itests/bnd/tb22.bnd                            |  13 -
 cdi-itests/bnd/{tb10.bnd => tb24.bnd}              |   2 +-
 cdi-itests/owb-itest.bndrun                        |  10 +-
 cdi-itests/pom.xml                                 | 139 +++--
 .../aries/cdi/test/cases/BeanPropertyTypeTest.java |  28 +-
 .../apache/aries/cdi/test/cases/CdiBeanTests.java  |   6 +-
 .../aries/cdi/test/cases/CdiContainerTests.java    |  12 +-
 .../aries/cdi/test/cases/CdiExtenderTests.java     |   4 +-
 .../aries/cdi/test/cases/ConfigurationTests.java   | 152 ++----
 .../cdi/test/cases/DisableComponentTests.java      |  28 +-
 .../apache/aries/cdi/test/cases/EventsTests.java   |  53 +-
 .../apache/aries/cdi/test/cases/ExcludeTests.java  |  83 +--
 .../cdi/test/cases/FactoryComponentTests.java      |  64 +--
 .../apache/aries/cdi/test/cases/HttpTestCase.java  | 217 ++------
 .../aries/cdi/test/cases/JndiExtensionTests.java   |  19 +-
 .../apache/aries/cdi/test/cases/MpConfigTests.java |  48 --
 .../aries/cdi/test/cases/MpMetricsTests.java       | 139 -----
 .../cdi/test/cases/OSGiBeanDescriptorTests.java    |  49 +-
 .../cases/OptionalReluctantReferenceTests.java     |  77 +--
 .../apache/aries/cdi/test/cases/ProducerTest.java  |  40 +-
 .../org/apache/aries/cdi/test/cases/Test152_2.java |  43 +-
 .../org/apache/aries/cdi/test/cases/Test152_3.java |  21 +-
 .../apache/aries/cdi/test/cases/Test152_3_1.java   |  64 +--
 .../apache/aries/cdi/test/cases/Test152_3_1_1.java | 588 ++++++++-------------
 .../cdi/test/cases/Test_discoverByBeansXml.java    |  23 +-
 .../org/apache/aries/cdi/test/cases/TrimTests.java |  51 +-
 .../BaseTestCase.java}                             | 147 ++----
 .../test/cases/{ => base}/CloseableTracker.java    |   2 +-
 .../cdi/test/cases/base/HttpBaseTestCase.java      |  86 +++
 .../cdi/test/cases/base/JaxrsBaseTestCase.java     |  50 ++
 .../SlimBaseTestCase.java}                         |  14 +-
 .../{tb21/A.java => cases/base/package-info.java}  |  32 +-
 .../aries/cdi/test/cases/jaxrs/ResourceTests.java  |  76 +++
 .../apache/aries/cdi/test/tb16/package-info.java   |  16 -
 .../cdi/test/{interfaces/Pojo.java => tb24/A.java} |  20 +-
 .../cdi/test/{beans => tb24}/package-info.java     |   4 +-
 .../resources/OSGI-INF/configurator/config.json    |   1 -
 cdi-itests/weld-itest.bndrun                       |  10 +-
 pom.xml                                            |  93 +++-
 131 files changed, 5079 insertions(+), 2066 deletions(-)
 create mode 100644 cdi-build-tools/src/main/java/org/apache/aries/cdi/build/tools/RequirementsAnnotationRemover.java
 copy {cdi-itests => cdi-extension-jaxrs}/LICENSE (100%)
 copy {cdi-itests => cdi-extension-jaxrs}/NOTICE (100%)
 copy {cdi-extension-servlet-owb => cdi-extension-jaxrs}/pom.xml (84%)
 copy cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPActivator.java => cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsActivator.java (80%)
 create mode 100644 cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsCDIExtension.java
 copy cdi-extension-el-jsp/src/main/java/org/apache/aries/cdi/extension/el/jsp/ELJSPExtensionFactory.java => cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/JaxrsExtensionFactory.java (87%)
 create mode 100644 cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs/Util.java
 copy {cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi => cdi-extension-jaxrs/src/main/java/org/apache/aries/cdi/extension/jaxrs}/package-info.java (80%)
 copy {cdi-itests => cdi-extension-mp-config}/base-itest.bndrun (85%)
 copy cdi-itests/bnd/tb10.bnd => cdi-extension-mp-config/bnd/tb01.bnd (91%)
 copy {cdi-itests => cdi-extension-mp-config}/logback.xml (100%)
 copy cdi-executable/owb-executable.bndrun => cdi-extension-mp-config/owb-itest.bndrun (82%)
 rename cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/{StubExtension.java => MPConfigExtension.java} (59%)
 create mode 100644 cdi-extension-mp-config/src/test/java/org/apache/aries/cdi/extension/mp/config/test/BaseTestCase.java
 copy cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java => cdi-extension-mp-config/src/test/java/org/apache/aries/cdi/extension/mp/config/test/MpConfigTests.java (50%)
 copy {cdi-itests/src/main/java/org/apache/aries/cdi => cdi-extension-mp-config/src/test/java/org/apache/aries/cdi/extension/mp/config}/test/interfaces/Pojo.java (92%)
 rename {cdi-itests/src/main/java/org/apache/aries/cdi/test/tb16 => cdi-extension-mp-config/src/test/java/org/apache/aries/cdi/extension/mp/config/test/tb01}/ConfiguredBean.java (88%)
 copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/beans => cdi-extension-mp-config/src/test/java/org/apache/aries/cdi/extension/mp/config/test/tb01}/package-info.java (91%)
 copy cdi-executable/weld-executable.bndrun => cdi-extension-mp-config/weld-itest.bndrun (83%)
 copy {cdi-itests => cdi-extension-mp-jwt-auth}/base-itest.bndrun (85%)
 copy .github/workflows/maven.yml => cdi-extension-mp-jwt-auth/bnd/tb01.bnd (63%)
 create mode 100644 cdi-extension-mp-jwt-auth/bnd/tb01.properties
 copy {cdi-itests => cdi-extension-mp-jwt-auth}/logback.xml (100%)
 copy {cdi-itests => cdi-extension-mp-jwt-auth}/owb-itest.bndrun (81%)
 create mode 100644 cdi-extension-mp-jwt-auth/pom.xml
 create mode 100644 cdi-extension-mp-jwt-auth/src/main/java/org/apache/aries/cdi/extension/mp/jwt/MPJwtAuthExtension.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/main/java/org/apache/aries/cdi/extension/mp/jwt/package-info.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/BaseTestCase.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/CookieTest.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/HttpBaseTestCase.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/JaxRsAsyncTest.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/JaxrsBaseTestCase.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/MpJwtAuthTests.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/PreProvidedTokenTest.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01/AsyncEndpoint.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01/PassthroughEndpoint.java
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01/RunAsFilter.java
 copy cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/E.java => cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01/TCKApplication.java (60%)
 create mode 100644 cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01/TokenInspector.java
 copy {cdi-itests/src/main/java/org/apache/aries/cdi/test/beans => cdi-extension-mp-jwt-auth/src/test/java/org/apache/aries/cdi/extension/mp/jwt/test/tb01}/package-info.java (91%)
 copy {cdi-itests => cdi-extension-mp-jwt-auth}/weld-itest.bndrun (81%)
 copy {cdi-itests => cdi-extension-mp-metrics}/base-itest.bndrun (85%)
 copy cdi-itests/bnd/tb10.bnd => cdi-extension-mp-metrics/bnd/tb01.bnd (91%)
 copy {cdi-itests => cdi-extension-mp-metrics}/logback.xml (100%)
 copy {cdi-itests => cdi-extension-mp-metrics}/owb-itest.bndrun (76%)
 rename cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/{StubExtension.java => MPMetricsExtension.java} (60%)
 delete mode 100644 cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubJsonProvider.java
 create mode 100644 cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics/test/BaseTestCase.java
 create mode 100644 cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics/test/HttpBaseTestCase.java
 create mode 100644 cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics/test/JaxrsBaseTestCase.java
 create mode 100644 cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics/test/MpMetricsTests.java
 copy {cdi-itests/src/main/java/org/apache/aries/cdi => cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics}/test/interfaces/Pojo.java (92%)
 rename {cdi-itests/src/main/java/org/apache/aries/cdi/test/tb22 => cdi-extension-mp-metrics/src/test/java/org/apache/aries/cdi/extension/mp/metrics/test/tb01}/A.java (89%)
 copy {cdi-itests => cdi-extension-mp-metrics}/weld-itest.bndrun (78%)
 copy {cdi-spi => cdi-extension-spi}/pom.xml (82%)
 create mode 100644 cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt/Adapted.java
 copy {cdi-extra/src/main/java/org/apache/aries/cdi/extra => cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/adapt}/package-info.java (93%)
 create mode 100644 cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/annotation/AdaptedService.java
 copy {cdi-extra/src/main/java/org/apache/aries/cdi/extra => cdi-extension-spi/src/main/java/org/apache/aries/cdi/extension/spi/annotation}/package-info.java (92%)
 delete mode 100644 cdi-itests/bnd/tb16.bnd
 delete mode 100644 cdi-itests/bnd/tb22.bnd
 copy cdi-itests/bnd/{tb10.bnd => tb24.bnd} (91%)
 delete mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/MpConfigTests.java
 delete mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/MpMetricsTests.java
 rename cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/{AbstractTestCase.java => base/BaseTestCase.java} (59%)
 rename cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/{ => base}/CloseableTracker.java (96%)
 create mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/base/HttpBaseTestCase.java
 create mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/base/JaxrsBaseTestCase.java
 rename cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/{SlimTestCase.java => base/SlimBaseTestCase.java} (70%)
 copy cdi-itests/src/main/java/org/apache/aries/cdi/test/{tb21/A.java => cases/base/package-info.java} (63%)
 create mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/jaxrs/ResourceTests.java
 delete mode 100644 cdi-itests/src/main/java/org/apache/aries/cdi/test/tb16/package-info.java
 copy cdi-itests/src/main/java/org/apache/aries/cdi/test/{interfaces/Pojo.java => tb24/A.java} (68%)
 copy cdi-itests/src/main/java/org/apache/aries/cdi/test/{beans => tb24}/package-info.java (82%)