Skip to content

Commit

Permalink
Merge pull request #15141 from volosied/11643-JSTL-refactoring
Browse files Browse the repository at this point in the history
11643: JSTL Refactoring
  • Loading branch information
volosied committed Jan 19, 2021
2 parents 6d3b914 + 35f537a commit cafc601
Show file tree
Hide file tree
Showing 25 changed files with 348 additions and 56 deletions.
5 changes: 5 additions & 0 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
Expand Up @@ -2021,6 +2021,11 @@
<artifactId>jersey-hk2</artifactId>
<version>2.26</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
Expand Down
1 change: 1 addition & 0 deletions dev/cnf/oss_dependencies.maven
Expand Up @@ -400,6 +400,7 @@ org.glassfish.jersey.core:jersey-server:2.12
org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2:2.30.1
org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava:2.30.1
org.glassfish.jersey.inject:jersey-hk2:2.26
org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0
org.glassfish:jakarta.faces:3.0.0-RC1
org.glassfish:jakarta.json:2.0.0
org.glassfish:javax.faces:2.3.3
Expand Down
Expand Up @@ -44,7 +44,8 @@ Subsystem-Name: JavaServer Pages 2.2
com.ibm.ws.jsp.jasper, \
com.ibm.ws.jsp, \
com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY, \
com.ibm.ws.org.apache.jasper.el.2.2
com.ibm.ws.org.apache.jasper.el.2.2, \
com.ibm.ws.org.apache.taglibs.standard
-jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \
com.ibm.websphere.javaee.jsp.tld.2.2; location:=dev/api/spec/
-files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip
Expand Down
Expand Up @@ -42,7 +42,8 @@ Subsystem-Name: JavaServer Pages 2.3
com.ibm.websphere.javaee.jstl.1.2; location:="dev/api/spec/,lib/"; mavenCoordinates="javax.servlet:jstl:1.2", \
com.ibm.ws.jsp.2.3, \
com.ibm.ws.jsp, \
com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY
com.ibm.ws.jsp.jstl.facade; start-phase:=CONTAINER_EARLY, \
com.ibm.ws.org.apache.taglibs.standard
-jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \
com.ibm.websphere.javaee.jsp.tld.2.2; location:=dev/api/spec/
-files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip
Expand Down
Expand Up @@ -41,7 +41,8 @@ Subsystem-Name: Jakarta Server Pages 3.0
io.openliberty.jakarta.jstl.2.0; location:="dev/api/spec/,lib/"; mavenCoordinates="jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0", \
com.ibm.ws.jsp.2.3.jakarta, \
com.ibm.ws.jsp.jakarta, \
com.ibm.ws.jsp.jstl.facade.jakarta; start-phase:=CONTAINER_EARLY
io.openliberty.jstl.facade; start-phase:=CONTAINER_EARLY, \
io.openliberty.org.apache.taglibs.standard
-jars=com.ibm.websphere.appserver.spi.jsp; location:=dev/spi/ibm/, \
com.ibm.websphere.javaee.jsp.tld.2.2.jakarta; location:=dev/api/spec/
-files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jsp_1.0-javadoc.zip
Expand Down
64 changes: 31 additions & 33 deletions dev/com.ibm.ws.jsp.jstl.facade/bnd.bnd
@@ -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
Expand All @@ -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)"
29 changes: 10 additions & 19 deletions dev/com.ibm.ws.jsp/bnd.bnd
@@ -1,12 +1,12 @@
#*******************************************************************************
# 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
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
# IBM Corporation - initial API and implementation
#*******************************************************************************
-include= ~../cnf/resources/bnd/bundle.props
bVersion=1.0
Expand Down Expand Up @@ -41,10 +41,10 @@ Service-Component: \
configuration-policy:=ignore;\
properties:="service.vendor=IBM,toType=com.ibm.ws.jsp.configuration.JspXmlExtConfig", \
com.ibm.ws.jsp.taglib.InjectionService; \
implementation:=com.ibm.ws.jsp.taglib.InjectionServiceImpl; \
provide:='com.ibm.wsspi.webcontainer.collaborator.WebAppInjectionClassListCollaborator'; \
immediate:=true; \
properties:="service.vendor=IBM"
implementation:=com.ibm.ws.jsp.taglib.InjectionServiceImpl; \
provide:='com.ibm.wsspi.webcontainer.collaborator.WebAppInjectionClassListCollaborator'; \
immediate:=true; \
properties:="service.vendor=IBM"

Export-Package: com.ibm.ws.jsp.runtime;version=2.2;thread-context=true, \
com.ibm.ws.jsp.jsx.tags;version=2.2;thread-context=true, \
Expand All @@ -60,20 +60,13 @@ Export-Package: com.ibm.ws.jsp.runtime;version=2.2;thread-context=true, \
com.ibm.ws.jsp.runtime.metadata;version=2.2, \
com.ibm.ws.jsp.webcontainerext;version=2.2, \
com.ibm.ws.jsp.webcontainerext.ws;version=2.2, \
org.apache.taglibs.standard.tag.common.sql;version=2.3, \
org.apache.taglibs.standard.tlv;thread-context=true;version=2.2, \
org.apache.taglibs.standard.tei;thread-context=true;version=2.2, \
org.apache.taglibs*;version=2.2, \
org.apache.jasper.compiler;thread-context=true;version=2.2, \
org.apache.jasper.runtime;thread-context=true;version=2.2


Private-Package: \
com.ibm.ws.jsp.*, \
com.ibm.ws.webcontainer.jsp.runtime, \
com.ibm.wsspi.jsp.*



Import-Package: \
junit.*;resolution:=optional, \
Expand Down Expand Up @@ -106,7 +99,6 @@ Import-Package: \
org.apache.el.parser;version="2.2", \
org.apache.el.util;version="2.2", \
org.apache.jasper.el;version="2.2", \
!org.apache.xerces*, \
com.ibm.wsspi.el;version="2.2", \
org.eclipse.jdt.core.compiler;version="3.10.2";usage="JSP", \
org.eclipse.jdt.internal.compiler;version="3.10.2";usage="JSP", \
Expand All @@ -116,11 +108,9 @@ Import-Package: \
org.eclipse.jdt.internal.compiler.problem;version="3.10.2";usage="JSP", \
sun.io;resolution:=optional, \
*

Include-Resource: \
@lib/bsf.jar, \
@${repo;com.ibm.ws.javax.j2ee:jsp.tld.standard;1.2}, \
@${repo;com.ibm.ws.org.apache:xalan;2.7.2}!/!META-INF/*, \
standard.jar=${repo;com.ibm.ws.javax.j2ee:standardtld;1.2}, \
ard.jar=lib/ard.jar, \
OSGI-INF=resources/OSGI-INF, \
Expand All @@ -133,7 +123,7 @@ Include-Resource: \
com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xml=src/com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xml, \
com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xsd=src/com/ibm/ws/jsp/translator/visitor/configuration/JspVisitorConfiguration.xsd, \
com/ibm/ws/jsp/taglib/config/TagLibCacheConfig.xsd=src/com/ibm/ws/jsp/taglib/config/TagLibCacheConfig.xsd

IBM-Default-Config: OSGI-INF/wlp/defaultInstances.xml

instrument.ffdc: false
Expand Down Expand Up @@ -165,4 +155,5 @@ instrument.classesExcludes: com/ibm/ws/jsp/resources/*.class
com.ibm.ws.org.apache.jasper.el.2.2;version=latest,\
com.ibm.ws.kernel.security.thread;version=latest,\
com.ibm.ws.artifact.url;version=latest, \
com.ibm.ws.org.osgi.annotation.versioning;version=latest
com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
com.ibm.ws.org.apache.taglibs.standard;version=latest
7 changes: 7 additions & 0 deletions dev/com.ibm.ws.org.apache.taglibs.standard/.classpath
@@ -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>
23 changes: 23 additions & 0 deletions dev/com.ibm.ws.org.apache.taglibs.standard/.project
@@ -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>
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
@@ -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
34 changes: 34 additions & 0 deletions dev/com.ibm.ws.org.apache.taglibs.standard/bnd.bnd
@@ -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
6 changes: 6 additions & 0 deletions dev/io.openliberty.jstl.facade/.classpath
@@ -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>
2 changes: 2 additions & 0 deletions dev/io.openliberty.jstl.facade/.gitignore
@@ -0,0 +1,2 @@
/bin/
/generated/
23 changes: 23 additions & 0 deletions dev/io.openliberty.jstl.facade/.project
@@ -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>
2 changes: 2 additions & 0 deletions dev/io.openliberty.jstl.facade/.settings/bndtools.core.prefs
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
@@ -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

0 comments on commit cafc601

Please sign in to comment.