Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-1925 jacc-per-app ( Payara 4 ) #2788

Merged
merged 11 commits into from May 31, 2018
Merged

PAYARA-1925 jacc-per-app ( Payara 4 ) #2788

merged 11 commits into from May 31, 2018

Conversation

arjantijms
Copy link
Contributor

Merge/backport of PAYARA-1925 into Payara 4

@arjantijms
PAYARA-1925 Prepare for changes
c9d5fb1 
Conflicts:
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/provider/BasePolicyWrapper.java
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/provider/PolicyConfigurationFactoryImpl.java
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/provider/PolicyConfigurationImpl.java
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/provider/PolicyWrapper.java
@arjantijms
PAYARA-1925 main implementation
683b660 
Added interfaces in the Payara API, and implemented these within Payara.

Fixed Payara 4 / JDK 7 integration issues

Conflicts:
	api/payara-api/pom.xml
	appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebBundleDescriptor.java
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManager.java
	appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java
	appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java
@arjantijms
PAYARA-1925 Fixing QuickLook tests first to be able to test actual
d495575 
failure

Conflicts:
	appserver/security/inmemory.jacc.provider/src/main/java/com/sun/enterprise/security/jacc/provider/SimplePolicyProvider.java
	appserver/tests/quicklook/build.xml
	appserver/tests/quicklook/pom.xml
@arjantijms
PAYARA-1925 Fixed 2 bugs - context ID can be null and re-entry
028d7ec 
Conflicts:
	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/provider/JDKPolicyFileWrapper.java
@arjantijms
PAYARA-2704 PAYARA-1925 Added option to set domain to QuickLook
619e0d2
@arjantijms
PAYARA-1925 JDK 7 fix
b0cec6b
@arjantijms
Merge remote-tracking branch 'upstream/Payara4' into
27ea96d 
PAYARA-1925-JaccPerApp-4-merge

# Conflicts:
#	api/payara-api/pom.xml
@arjantijms
Copy link
Contributor Author

jenkins quick test payara 4 please

@arjantijms arjantijms changed the title Payara 1925 jacc per app 4 merge Payara 1925 jacc per app Payara 4 May 29, 2018
@payara-ci
Copy link
Contributor

Quick build and test passed!

@Pandrex247
Copy link
Member

jenkins quick test payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test failed!

@Pandrex247
Copy link
Member

@arjantijms Ruh Roh!

[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/api/payara-api/src/main/jdk7/fish/payara/jacc/JaccConfigurationFactory.java:[102,37] modifier static not allowed here [ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/api/payara-api/src/main/jdk7/fish/payara/jacc/JaccConfigurationFactory.java:[102,67] interface methods cannot have body

@arjantijms
Copy link
Contributor Author

jenkins quick test payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test failed!

@arjantijms
Copy link
Contributor Author

[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[69,17] cannot find symbol
[ERROR] symbol: class Base64
[ERROR] location: package java.util
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[196,32] package Base64 does not exist
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[197,32] package Base64 does not exist
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[69,17] cannot find symbol
[ERROR] symbol: class Base64
[ERROR] location: package java.util
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[196,32] package Base64 does not exist
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[197,32] package Base64 does not exist
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[196,51] cannot find symbol
[ERROR] symbol: variable Base64
[ERROR] location: class com.sun.enterprise.web.WebModule
[ERROR] /JenkinsWorkspace/JenkinsJobs/PayaraQuickBuild-JDK7/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java:[197,51] cannot find symbol
[ERROR] symbol: variable Base64
[ERROR] location: class com.sun.enterprise.web.WebModule

@arjantijms
Copy link
Contributor Author

jenkins quick test payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test failed!

@arjantijms
Copy link
Contributor Author

jenkins quick test payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test failed!

@arjantijms
Copy link
Contributor Author

jenkins quick test payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test failed!

@lprimak lprimak changed the title Payara 1925 jacc per app Payara 4 PAYARA-1925 jacc per app Payara 4 May 30, 2018
@lprimak lprimak changed the title PAYARA-1925 jacc per app Payara 4 PAYARA-1925 jacc-per-app ( Payara 4 ) May 30, 2018
@Pandrex247
Copy link
Member

Jenkins, quick test Payara 4 JDK7 please

@payara-ci
Copy link
Contributor

Quick build and test passed!

@Pandrex247 Pandrex247 merged commit 9b96cf0 into payara:Payara4 May 31, 2018
@arjantijms arjantijms deleted the PAYARA-1925-JaccPerApp-4-merge branch May 31, 2018 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lprimak lprimak lprimak approved these changes

Assignees

@arjantijms arjantijms

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@arjantijms @payara-ci @Pandrex247 @lprimak