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.
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
JSTL Refactoring & Pull in JSTL 2.0 Impl #15141
Merged
volosied
merged 5 commits into
OpenLiberty:integration
from
volosied:11643-JSTL-refactoring
Jan 19, 2021
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2c3a1c5
Pull JSTL 1.2 out of com.ibm.ws.jsp and into a new component
volosied 370e052
Create io.openliberty.jstl.facade as part of JSTL refactoring
volosied f4c8fb1
Add JSTL Impl Sources Jar
volosied ba21a24
Update copyrights to 2021
volosied 35f537a
Update Taglib Bnds
volosied File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#******************************************************************************* | ||
# Copyright (c) 2017, 2020 IBM Corporation and others. | ||
# Copyright (c) 2017, 2021 IBM Corporation and others. | ||
# All rights reserved. This program and the accompanying materials | ||
# are made available under the terms of the Eclipse Public License v1.0 | ||
# which accompanies this distribution, and is available at | ||
|
@@ -18,41 +18,39 @@ Bundle-Description: facade to provide a classloader for our internal jstl classe | |
|
||
Provide-Capability: com.ibm.ws.jsp.jstl.facade | ||
|
||
jakartaeeMe: true | ||
|
||
Import-Package: \ | ||
javax.el;version="[2.2.0,4.0.0)", \ | ||
javax.servlet.jsp;version="[2.2,3.0)", \ | ||
javax.servlet.jsp.el;version="[2.2,3.0)", \ | ||
javax.servlet.jsp.resources;version="[2.2,3.0)", \ | ||
javax.servlet.jsp.tagext;version="[2.2,3.0)", \ | ||
javax.servlet.jsp.jstl.core;version="[1.2.0,2.0.0)", \ | ||
javax.servlet.jsp.jstl.fmt;version="[1.2.0,2.0.0)", \ | ||
javax.servlet.jsp.jstl.sql;version="[1.2.0,2.0.0)", \ | ||
javax.servlet.jsp.jstl.tlv;version="[1.2.0,2.0.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections.iterators;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections.map;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.extra.spath;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.functions;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.lang.jstl;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.parser;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.test;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.test.beans;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.lang.support;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.resources;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.common.core;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.common.fmt;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.common.sql;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.common.xml;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.el.core;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.el.fmt;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.el.sql;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.el.xml;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.rt.core;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.rt.fmt;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.rt.sql;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tag.rt.xml;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tei;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard.tlv;version="[2.2,3.0)", \ | ||
org.apache.taglibs.standard;version="[2.2,3.0)" | ||
javax.servlet.jsp.jstl.core;version="[1.2,2.0)", \ | ||
javax.servlet.jsp.jstl.fmt;version="[1.2,2.0)", \ | ||
javax.servlet.jsp.jstl.sql;version="[1.2,2.0)", \ | ||
javax.servlet.jsp.jstl.tlv;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.functions;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.lang.jstl;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.parser;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.test;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.lang.jstl.test.beans;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.lang.support;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.resources;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.common.core;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.common.fmt;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.common.sql;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.common.xml;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.el.core;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.el.fmt;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.el.sql;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.el.xml;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.rt.core;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.rt.fmt;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.rt.sql;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tag.rt.xml;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tei;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.tlv;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections.iterators;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.extra.commons.collections.map;version="[1.2,2.0)", \ | ||
org.apache.taglibs.standard.extra.spath;version="[1.2,2.0)" | ||
Comment on lines
+53
to
+56
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These taglibs.standard packages were just moved to the bottom. |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<classpath> | ||
<classpathentry kind="src" path="src"/> | ||
<classpathentry kind="con" path="aQute.bnd.classpath.container"/> | ||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | ||
<classpathentry kind="output" path="bin"/> | ||
</classpath> |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<projectDescription> | ||
<name>com.ibm.ws.org.apache.taglibs.standard</name> | ||
<comment></comment> | ||
<projects> | ||
</projects> | ||
<buildSpec> | ||
<buildCommand> | ||
<name>org.eclipse.jdt.core.javabuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>bndtools.core.bndbuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
</buildSpec> | ||
<natures> | ||
<nature>org.eclipse.jdt.core.javanature</nature> | ||
<nature>bndtools.core.bndnature</nature> | ||
</natures> | ||
</projectDescription> |
2 changes: 2 additions & 0 deletions
2
dev/com.ibm.ws.org.apache.taglibs.standard/.settings/bndtools.core.prefs
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
compileErrorAction=build | ||
eclipse.preferences.version=1 |
12 changes: 12 additions & 0 deletions
12
dev/com.ibm.ws.org.apache.taglibs.standard/.settings/org.eclipse.jdt.core.prefs
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
eclipse.preferences.version=1 | ||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 | ||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
org.eclipse.jdt.core.compiler.compliance=1.8 | ||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
org.eclipse.jdt.core.compiler.release=enabled | ||
org.eclipse.jdt.core.compiler.source=1.8 |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#******************************************************************************* | ||
# Copyright (c) 2021 IBM Corporation and others. | ||
# All rights reserved. This program and the accompanying materials | ||
# are made available under the terms of the Eclipse Public License v1.0 | ||
# which accompanies this distribution, and is available at | ||
# http://www.eclipse.org/legal/epl-v10.html | ||
# | ||
# Contributors: | ||
# IBM Corporation - initial API and implementation | ||
#******************************************************************************* | ||
-include= ~../cnf/resources/bnd/bundle.props | ||
bVersion=1.0 | ||
|
||
Bundle-SymbolicName: com.ibm.ws.org.apache.taglibs.standard | ||
Bundle-Description: JSTL Impl Version 1.2 | ||
|
||
Fragment-Host: com.ibm.ws.jsp | ||
|
||
Import-Package: \ | ||
!org.apache.xml.*,\ | ||
!org.apache.xerces*, \ | ||
* | ||
|
||
Export-Package: \ | ||
org.apache.taglibs.standard.tlv;thread-context=true;version=1.2, \ | ||
org.apache.taglibs.standard.tei;thread-context=true;version=1.2, \ | ||
org.apache.taglibs*;version=1.2 | ||
|
||
Include-Resource: \ | ||
@${repo;com.ibm.ws.javax.j2ee:jsp.tld.standard;1.2}!/META-INF/*.tld,\ | ||
@${repo;com.ibm.ws.org.apache:xalan;2.7.2}!/!META-INF/* | ||
|
||
-buildpath: \ | ||
com.ibm.ws.javax.j2ee:jsp.tld.standard;version=1.2 |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<classpath> | ||
<classpathentry kind="con" path="aQute.bnd.classpath.container"/> | ||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | ||
<classpathentry kind="output" path="bin"/> | ||
</classpath> |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
/bin/ | ||
/generated/ |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<projectDescription> | ||
<name>io.openliberty.jstl.facade</name> | ||
<comment></comment> | ||
<projects> | ||
</projects> | ||
<buildSpec> | ||
<buildCommand> | ||
<name>org.eclipse.jdt.core.javabuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>bndtools.core.bndbuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
</buildSpec> | ||
<natures> | ||
<nature>org.eclipse.jdt.core.javanature</nature> | ||
<nature>bndtools.core.bndnature</nature> | ||
</natures> | ||
</projectDescription> |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
compileErrorAction=build | ||
eclipse.preferences.version=1 |
11 changes: 11 additions & 0 deletions
11
dev/io.openliberty.jstl.facade/.settings/org.eclipse.jdt.core.prefs
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
eclipse.preferences.version=1 | ||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 | ||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
org.eclipse.jdt.core.compiler.compliance=1.8 | ||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
org.eclipse.jdt.core.compiler.source=1.8 |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2.2,3.0 versions above ( for JSP) were changed to support the JSTL versions (1,2 and 2.0)