You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/10/23 11:23:13 UTC
[shiro] branch main updated (df2f548 -> b637c46)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git.
from df2f548 Merge pull request #328 from bmarwell/java17_jenkins
new 1820746 JAX-RS IT (stormtrooper example). Meecrowave and OpenLiberty.
new 113b332 use more recent failsafe plugin again.
new 6da24f3 add-opens to liberty.
new b637c46 Merge pull request #315 from bmarwell/meecrowave-it
The 2203 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:
.../jaxrs/app}/pom.xml | 74 +++++-----
.../shiro/testing/jaxrs/app/JaxRsApplication.java | 17 ++-
.../jaxrs/app/config/JaxRsShiroFeature.java | 24 ++--
.../testing/jaxrs/app/config/ShiroListener.java | 22 ++-
.../jaxrs/app/config/ShiroServletFilter.java | 26 ++--
.../jaxrs/app/dao/InMemoryStormtrooperDao.java | 92 +++++++++++++
.../testing/jaxrs/app/dao/StormtrooperDao.java | 25 ++--
.../jaxrs/app/json/JsonbConfigProvider.java | 33 ++---
.../jaxrs/app/json/StormtrooperIdConverter.java | 35 ++---
.../testing/jaxrs/app/model/Stormtrooper.java | 82 ++++++++++++
.../testing/jaxrs/app/model/StormtrooperId.java | 78 +++++++++++
.../jaxrs/app/model/StormtrooperTemplate.java | 62 +++++++++
.../shiro/testing/jaxrs/app/package-info.java | 6 +-
.../jaxrs/app/resources/StormtrooperResource.java | 104 ++++++++++++++
.../jaxrs/app/src/main/resources/META-INF/NOTICE | 10 ++
.../app/src/main/resources/META-INF/beans.xml | 18 ++-
.../META-INF/resources}/WEB-INF/shiro.ini | 19 +--
.../jaxrs/app/src/main/webapp/WEB-INF/beans.xml | 18 ++-
.../jaxrs/app}/src/main/webapp/WEB-INF/shiro.ini | 19 +--
integration-tests/jaxrs/meecrowave/pom.xml | 91 +++++++++++++
.../testing/jaxrs/meecrowave/MeecrowaveIT.java | 33 +++--
.../jaxrs/meecrowave/src/test/resources/log4j2.xml | 62 +++++++++
integration-tests/jaxrs/openliberty/pom.xml | 149 +++++++++++++++++++++
.../openliberty/src/main/liberty/config/server.xml | 44 ++++++
.../testing/jaxrs/openliberty/OpenLibertyIT.java | 21 ++-
.../support => integration-tests/jaxrs}/pom.xml | 19 ++-
integration-tests/jaxrs/tests/pom.xml | 98 ++++++++++++++
.../testing/jaxrs/tests/AbstractShiroJaxRsIT.java | 79 +++++++++++
integration-tests/meecrowave-support/pom.xml | 74 ++++++++++
.../META-INF/openwebbeans/openwebbeans.properties | 38 ++++++
integration-tests/pom.xml | 14 ++
pom.xml | 30 +++++
32 files changed, 1295 insertions(+), 221 deletions(-)
copy {samples/spring-boot-web => integration-tests/jaxrs/app}/pom.xml (50%)
copy core/src/test/java/org/apache/shiro/authz/AuthorizationExceptionTest.java => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/JaxRsApplication.java (68%)
copy core/src/test/java/org/apache/shiro/authc/ConcurrentAccessExceptionTest.java => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/config/JaxRsShiroFeature.java (67%)
copy event/src/test/groovy/org/apache/shiro/event/support/SimpleSubscriber.groovy => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/config/ShiroListener.java (71%)
copy core/src/main/java/org/apache/shiro/env/EnvironmentException.java => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/config/ShiroServletFilter.java (62%)
create mode 100644 integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/dao/InMemoryStormtrooperDao.java
copy samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/dao/StormtrooperDao.java (55%)
copy support/jaxrs/src/main/java/org/apache/shiro/web/jaxrs/SubjectPrincipalRequestFilter.java => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/json/JsonbConfigProvider.java (53%)
copy event/src/test/groovy/org/apache/shiro/event/support/SubclassTestSubscriber.groovy => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/json/StormtrooperIdConverter.java (61%)
create mode 100644 integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/model/Stormtrooper.java
create mode 100644 integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/model/StormtrooperId.java
create mode 100644 integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/model/StormtrooperTemplate.java
copy event/src/test/groovy/org/apache/shiro/event/support/SimpleEvent.groovy => integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/package-info.java (91%)
create mode 100644 integration-tests/jaxrs/app/src/main/java/org/apache/shiro/testing/jaxrs/app/resources/StormtrooperResource.java
create mode 100644 integration-tests/jaxrs/app/src/main/resources/META-INF/NOTICE
copy samples/servlet-plugin/src/main/webapp/WEB-INF/web.xml => integration-tests/jaxrs/app/src/main/resources/META-INF/beans.xml (70%)
copy {samples/guice/src/main/webapp => integration-tests/jaxrs/app/src/main/resources/META-INF/resources}/WEB-INF/shiro.ini (71%)
copy samples/servlet-plugin/src/main/webapp/WEB-INF/web.xml => integration-tests/jaxrs/app/src/main/webapp/WEB-INF/beans.xml (70%)
copy {samples/guice => integration-tests/jaxrs/app}/src/main/webapp/WEB-INF/shiro.ini (71%)
create mode 100644 integration-tests/jaxrs/meecrowave/pom.xml
copy web/src/test/java/org/apache/shiro/web/env/FilterStub.java => integration-tests/jaxrs/meecrowave/src/test/java/org/apache/shiro/testing/jaxrs/meecrowave/MeecrowaveIT.java (55%)
create mode 100644 integration-tests/jaxrs/meecrowave/src/test/resources/log4j2.xml
create mode 100644 integration-tests/jaxrs/openliberty/pom.xml
create mode 100644 integration-tests/jaxrs/openliberty/src/main/liberty/config/server.xml
copy core/src/test/java/org/apache/shiro/authc/ConcurrentAccessExceptionTest.java => integration-tests/jaxrs/openliberty/src/test/java/org/apache/shiro/testing/jaxrs/openliberty/OpenLibertyIT.java (63%)
copy {crypto/support => integration-tests/jaxrs}/pom.xml (74%)
create mode 100644 integration-tests/jaxrs/tests/pom.xml
create mode 100644 integration-tests/jaxrs/tests/src/main/java/org/apache/shiro/testing/jaxrs/tests/AbstractShiroJaxRsIT.java
create mode 100644 integration-tests/meecrowave-support/pom.xml
create mode 100644 integration-tests/meecrowave-support/src/main/resources/META-INF/openwebbeans/openwebbeans.properties