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

PAYARA-1765 Distributable web.xml handling broken for WEB-INF/lib archive #1692

Merged
merged 3 commits into from
Jun 20, 2017
Merged

PAYARA-1765 Distributable web.xml handling broken for WEB-INF/lib archive #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c816f1
application is still considered distributable when archives don't hav…
lprimak Jun 19, 2017
439746a
copyright fix
lprimak Jun 19, 2017
367bd6e
fixed failing test
lprimak Jun 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...erver/web/web-glue/src/main/java/org/glassfish/web/deployment/archivist/WebArchivist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2014-2016] [Payara Foundation and/or its affiliates]
// Portions Copyright [2014-2017] [Payara Foundation and/or its affiliates]

package org.glassfish.web.deployment.archivist;

Expand Down Expand Up @@ -343,17 +343,18 @@ protected void postAnnotationProcess(WebBundleDescriptorImpl descriptor,
}
}

WebFragmentDescriptor mergedWebFragment = null;
WebFragmentDescriptor mergedWebFragment = new WebFragmentDescriptor();
mergedWebFragment.setExists(false);
for (WebFragmentDescriptor wf : wfList) {
if (mergedWebFragment == null) {
mergedWebFragment = wf;
} else {
mergedWebFragment.addWebBundleDescriptor(wf);
// we have the first fragment that's contains the web-fragment.xml file
if(!mergedWebFragment.isExists() && wf.isExists()) {
mergedWebFragment.setExists(true);
mergedWebFragment.setDistributable(wf.isDistributable());
}
mergedWebFragment.addWebBundleDescriptor(wf);
}

if (mergedWebFragment != null) {
mergedWebFragment.setExists(true);
if (!wfList.isEmpty()) {
descriptor.addWebBundleDescriptor(mergedWebFragment);

// if there any mapping stubs left, there is something invalid referenced from web.xml
Expand Down
17 changes: 8 additions & 9 deletions ...b-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
// Portions Copyright [2014-2016] [Payara Foundation and/or its affiliates]
// Portions Copyright [2014-2017] [Payara Foundation and/or its affiliates]

package org.glassfish.web.deployment.descriptor;

Expand Down Expand Up @@ -262,14 +262,13 @@ private void addCommonWebBundleDescriptor(WebBundleDescriptor wbd,
// combine login config with conflict resolution check
combineLoginConfiguration(webBundleDescriptor);

if (!defaultDescriptor) {
if (webBundleDescriptor.isExists()) {
boolean otherDistributable = webBundleDescriptor.isDistributable();
// the only way distributable is true is when
// all of it's web fragments are true
// The Servlet spec (section 8.2.3):
setDistributable(distributable && otherDistributable);
}
if (!defaultDescriptor && webBundleDescriptor.isExists()) {
// ignore non-fragment (plain archive) files
boolean otherDistributable = webBundleDescriptor.isDistributable();
// the only way distributable is true is when
// all of it's web fragments are true
// The Servlet spec (section 8.2.3):
setDistributable(distributable && otherDistributable);
}

combinePostConstructDescriptors(webBundleDescriptor);
Expand Down