[SHIRO-617] ShiroFilter initialize WebEnvironment on startup#59
Closed
col-panic wants to merge 5 commits intoapache:mainfrom
Closed
[SHIRO-617] ShiroFilter initialize WebEnvironment on startup#59col-panic wants to merge 5 commits intoapache:mainfrom
col-panic wants to merge 5 commits intoapache:mainfrom
Conversation
bdemers
reviewed
Oct 24, 2017
| instantiateWebEnvironmentIfNotAvailable); | ||
|
|
||
| setSecurityManager(env.getWebSecurityManager()); | ||
| setSecurityManager(env.getWebSecurityManager()); |
Member
There was a problem hiding this comment.
nit: Can you fix the white space?
bdemers
reviewed
Oct 24, 2017
| * If the {@link WebEnvironment} was instantiated within | ||
| * {@link #getRequiredWebEnvironment(ServletContext, boolean)} this | ||
| * attribute contains the respective {@link EnvironmentLoader} | ||
| * |
Member
There was a problem hiding this comment.
the @since tags would be at least would need to be 1.5 as this would be a new feature
bdemers
requested changes
Oct 24, 2017
Member
bdemers
left a comment
bdemers
left a comment
There was a problem hiding this comment.
Can you add a few tests? Can you describe the use-case for this in the javadoc for public ShiroFilter(boolean instantiateWebEnvironmentIfNotAvailable) ?
Author
|
I updated the tags and added some JavaDoc. I am unsure about the tests though. Could you give me some advice on integrating a test? |
Member
|
Hey @col-panic! You should be able to write some EasyMock UTs to verify that |
fpapon
changed the title
Member
|
@col-panic Hi, thanks for your PR, I'm actually working about OSGi in Shiro, I will take a look. |
|
Refer to this link for build results (access rights to CI server needed): Build result: FAILURE[...truncated 862.01 KB...][JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/pom.xml to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-tests.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-tests.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-javadoc.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-javadoc.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-sources.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-sources.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/aspectj/pom.xml to org.apache.shiro.samples/samples-aspectj/1.5.0-SNAPSHOT/samples-aspectj-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/spring-boot-web/pom.xml to org.apache.shiro.samples/samples-spring-boot-web/1.5.0-SNAPSHOT/samples-spring-boot-web-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/spring-client/pom.xml to org.apache.shiro.samples/samples-spring-client/1.5.0-SNAPSHOT/samples-spring-client-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/tools/hasher/pom.xml to org.apache.shiro.tools/shiro-tools-hasher/1.5.0-SNAPSHOT/shiro-tools-hasher-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/spring-boot/spring-boot-starter/pom.xml to org.apache.shiro/shiro-spring-boot-starter/1.5.0-SNAPSHOT/shiro-spring-boot-starter-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/jaxrs/pom.xml to org.apache.shiro/shiro-jaxrs/1.5.0-SNAPSHOT/shiro-jaxrs-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/guice/pom.xml to org.apache.shiro.samples/samples-guice/1.5.0-SNAPSHOT/samples-guice-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/pom.xml to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT-javadoc.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT-javadoc.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT-sources.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT-sources.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/web/pom.xml to org.apache.shiro.samples/samples-web/1.5.0-SNAPSHOT/samples-web-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/servlet-plugin/pom.xml to org.apache.shiro/shiro-servlet-plugin/1.5.0-SNAPSHOT/shiro-servlet-plugin-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/spring/pom.xml to org.apache.shiro/shiro-spring/1.5.0-SNAPSHOT/shiro-spring-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/guice/pom.xml to org.apache.shiro/shiro-guice/1.5.0-SNAPSHOT/shiro-guice-1.5.0-SNAPSHOT.pomchannel stoppedSetting status of 6e8a7ac to FAILURE with url https://builds.apache.org/job/Shiro-pr/101/ and message: 'FAILURE 'Using context: Jenkins: mvn clean install |
Member
|
retest this please |
Contributor
|
Refer to this link for build results (access rights to CI server needed): Build result: FAILURE[...truncated 437.14 KB...][JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/pom.xml to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-tests.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-tests.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-javadoc.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-javadoc.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/core/target/shiro-core-1.5.0-SNAPSHOT-sources.jar to org.apache.shiro/shiro-core/1.5.0-SNAPSHOT/shiro-core-1.5.0-SNAPSHOT-sources.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/aspectj/pom.xml to org.apache.shiro.samples/samples-aspectj/1.5.0-SNAPSHOT/samples-aspectj-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/spring-boot-web/pom.xml to org.apache.shiro.samples/samples-spring-boot-web/1.5.0-SNAPSHOT/samples-spring-boot-web-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/spring-client/pom.xml to org.apache.shiro.samples/samples-spring-client/1.5.0-SNAPSHOT/samples-spring-client-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/tools/hasher/pom.xml to org.apache.shiro.tools/shiro-tools-hasher/1.5.0-SNAPSHOT/shiro-tools-hasher-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/spring-boot/spring-boot-starter/pom.xml to org.apache.shiro/shiro-spring-boot-starter/1.5.0-SNAPSHOT/shiro-spring-boot-starter-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/jaxrs/pom.xml to org.apache.shiro/shiro-jaxrs/1.5.0-SNAPSHOT/shiro-jaxrs-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/guice/pom.xml to org.apache.shiro.samples/samples-guice/1.5.0-SNAPSHOT/samples-guice-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/pom.xml to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT-javadoc.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT-javadoc.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/crypto/cipher/target/shiro-crypto-cipher-1.5.0-SNAPSHOT-sources.jar to org.apache.shiro/shiro-crypto-cipher/1.5.0-SNAPSHOT/shiro-crypto-cipher-1.5.0-SNAPSHOT-sources.jar[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/samples/web/pom.xml to org.apache.shiro.samples/samples-web/1.5.0-SNAPSHOT/samples-web-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/servlet-plugin/pom.xml to org.apache.shiro/shiro-servlet-plugin/1.5.0-SNAPSHOT/shiro-servlet-plugin-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/spring/pom.xml to org.apache.shiro/shiro-spring/1.5.0-SNAPSHOT/shiro-spring-1.5.0-SNAPSHOT.pom[JENKINS] Archiving /home/jenkins/jenkins-slave/workspace/Shiro-pr/support/guice/pom.xml to org.apache.shiro/shiro-guice/1.5.0-SNAPSHOT/shiro-guice-1.5.0-SNAPSHOT.pomchannel stoppedSetting status of 6e8a7ac to FAILURE with url https://builds.apache.org/job/Shiro-pr/166/ and message: 'FAILURE 'Using context: Jenkins: mvn clean install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please consider the pull request, as documented in https://issues.apache.org/jira/browse/SHIRO-617
The Reverted patch was wrongly made against a 1.3.2. The relevant patch is dc3da92