You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/11/29 15:38:15 UTC
[sling-org-apache-sling-scripting-jsp] branch issue/SLING-8867
created (now f7de658)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch issue/SLING-8867
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git.
at f7de658 SLING-8867 - Enhance the pageContext with the values provided by the SlingBindings
This branch includes the following new commits:
new f7de658 SLING-8867 - Enhance the pageContext with the values provided by the SlingBindings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-scripting-jsp] 01/01: SLING-8867 - Enhance
the pageContext with the values provided by the SlingBindings
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch issue/SLING-8867
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git
commit f7de658ab638fab4cf989f5f86b497c621fb5994
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Nov 29 16:36:43 2019 +0100
SLING-8867 - Enhance the pageContext with the values provided by the SlingBindings
* wrapped the default PageContent in order to be able to provide the JSP
scripts with bindings entries, through the pageContext
---
.../sling/scripting/jsp/SlingJspPageContext.java | 208 +++++++++++++++++++++
.../jsp/jasper/compiler/JspRuntimeContext.java | 12 +-
2 files changed, 219 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/jsp/SlingJspPageContext.java b/src/main/java/org/apache/sling/scripting/jsp/SlingJspPageContext.java
new file mode 100644
index 0000000..f8683a9
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/jsp/SlingJspPageContext.java
@@ -0,0 +1,208 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.scripting.jsp;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.el.ELContext;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.ErrorData;
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.BodyContent;
+
+import org.apache.sling.api.scripting.SlingBindings;
+
+public class SlingJspPageContext extends PageContext {
+
+ private final PageContext wrapped;
+ private final SlingBindings slingBindings;
+ private final ELContext elContext;
+
+ public SlingJspPageContext(PageContext wrapped, SlingBindings slingBindings) {
+ this.wrapped = wrapped;
+ this.slingBindings = slingBindings;
+ elContext = wrapped.getELContext();
+ elContext.putContext(JspContext.class, this);
+ }
+
+ @Override
+ public void initialize(Servlet servlet, ServletRequest servletRequest, ServletResponse servletResponse, String s, boolean b, int i,
+ boolean b1) throws IOException, IllegalStateException, IllegalArgumentException {
+ wrapped.initialize(servlet, servletRequest, servletResponse, s, b, i, b1);
+ }
+
+ @Override
+ public void release() {
+ wrapped.release();
+ }
+
+ @Override
+ public HttpSession getSession() {
+ return wrapped.getSession();
+ }
+
+ @Override
+ public Object getPage() {
+ return wrapped.getPage();
+ }
+
+ @Override
+ public ServletRequest getRequest() {
+ return wrapped.getRequest();
+ }
+
+ @Override
+ public ServletResponse getResponse() {
+ return wrapped.getResponse();
+ }
+
+ @Override
+ public Exception getException() {
+ return wrapped.getException();
+ }
+
+ @Override
+ public ServletConfig getServletConfig() {
+ return wrapped.getServletConfig();
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return wrapped.getServletContext();
+ }
+
+ @Override
+ public void forward(String s) throws ServletException, IOException {
+ wrapped.forward(s);
+ }
+
+ @Override
+ public void include(String s) throws ServletException, IOException {
+ wrapped.include(s);
+ }
+
+ @Override
+ public void include(String s, boolean b) throws ServletException, IOException {
+ wrapped.include(s, b);
+ }
+
+ @Override
+ public void handlePageException(Exception e) throws ServletException, IOException {
+ wrapped.handlePageException(e);
+ }
+
+ @Override
+ public void handlePageException(Throwable throwable) throws ServletException, IOException {
+ wrapped.handlePageException(throwable);
+ }
+
+ @Override
+ public void setAttribute(String s, Object o) {
+ wrapped.setAttribute(s, o);
+ }
+
+ @Override
+ public void setAttribute(String s, Object o, int i) {
+ wrapped.setAttribute(s, o, i);
+ }
+
+ @Override
+ public Object getAttribute(String s) {
+ Object attribute = wrapped.getAttribute(s);
+ if (attribute == null) {
+ attribute = slingBindings.get(s);
+ }
+ return attribute;
+ }
+
+ @Override
+ public Object getAttribute(String s, int i) {
+ return wrapped.getAttribute(s, i);
+ }
+
+ @Override
+ public Object findAttribute(String s) {
+ Object attribute = wrapped.findAttribute(s);
+ if (attribute == null) {
+ attribute = slingBindings.get(s);
+ }
+ return attribute;
+ }
+
+ @Override
+ public void removeAttribute(String s) {
+ wrapped.removeAttribute(s);
+ }
+
+ @Override
+ public void removeAttribute(String s, int i) {
+ wrapped.removeAttribute(s, i);
+ }
+
+ @Override
+ public int getAttributesScope(String s) {
+ return wrapped.getAttributesScope(s);
+ }
+
+ @Override
+ public Enumeration<String> getAttributeNamesInScope(int i) {
+ return wrapped.getAttributeNamesInScope(i);
+ }
+
+ @Override
+ public JspWriter getOut() {
+ return wrapped.getOut();
+ }
+
+ @Override
+ public ExpressionEvaluator getExpressionEvaluator() {
+ return wrapped.getExpressionEvaluator();
+ }
+
+ @Override
+ public ELContext getELContext() {
+ return elContext;
+ }
+
+ @Override
+ public VariableResolver getVariableResolver() {
+ return wrapped.getVariableResolver();
+ }
+
+ @Override
+ public BodyContent pushBody() {
+ return wrapped.pushBody();
+ }
+
+ @Override
+ public ErrorData getErrorData() {
+ return wrapped.getErrorData();
+ }
+}
diff --git a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
index 9a1af74..c544c53 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
@@ -45,7 +45,10 @@ import javax.servlet.jsp.PageContext;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.path.Path;
+import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.scripting.jsp.SlingJspPageContext;
import org.apache.sling.scripting.jsp.jasper.Constants;
import org.apache.sling.scripting.jsp.jasper.IOProvider;
import org.apache.sling.scripting.jsp.jasper.Options;
@@ -102,9 +105,16 @@ public final class JspRuntimeContext {
ServletRequest paramServletRequest,
ServletResponse paramServletResponse, String paramString,
boolean paramBoolean1, int paramInt, boolean paramBoolean2) {
- return this.getFactory().getPageContext(paramServlet, paramServletRequest,
+ PageContext context = this.getFactory().getPageContext(paramServlet, paramServletRequest,
paramServletResponse, paramString, paramBoolean1,
paramInt, paramBoolean2);
+ if (paramServletRequest instanceof SlingHttpServletRequest) {
+ SlingBindings slingBindings = (SlingBindings) paramServletRequest.getAttribute(SlingBindings.class.getName());
+ if (slingBindings != null) {
+ context = new SlingJspPageContext(context, slingBindings);
+ }
+ }
+ return context;
}
@Override