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

Initial support for Pages 4.0 M1 #67

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Initial support for Pages 4.0 M1 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7301eac
Initial support for Pages 4.0 M1
arjantijms Dec 8, 2023
329695a
Updated JDK to 17
arjantijms Dec 8, 2023
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
26 changes: 8 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<relativePath/>
</parent>

<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
<version>3.2.2-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>

<name>WaSP</name>
<description>Eclipse compatible implementation of Jakarta Server Pages</description>
Expand Down Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.1.1</version>
<version>4.0.0-M1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -91,13 +91,13 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<version>6.1.0-M1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.1</version>
<version>6.0.0-M1</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -159,13 +159,13 @@
</executions>
</plugin>

<!-- Restricts the Java version to 11 -->
<!-- Restricts the Java version to 17 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>11</release>
<release>17</release>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
Expand All @@ -178,7 +178,7 @@
<configuration>
<instructions>
<_noimportjava>true</_noimportjava>
<_runee>JavaSE-11</_runee>
<_runee>JavaSE-17</_runee>
<Automatic-Module-Name>org.glassfish.wasp</Automatic-Module-Name>
<Extension-Name>org.glassfish.wasp.wasp</Extension-Name>
<Bundle-SymbolicName>org.glassfish.wasp.wasp</Bundle-SymbolicName>
Expand Down Expand Up @@ -321,16 +321,6 @@
<goal>jar</goal>
</goals>
<configuration>
<source>11</source>

<additionalparam>-Xdoclint:none</additionalparam>
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
<additionalJOption>-Xdoclint:none</additionalJOption>
<additionalJOptions>
<additionalJOption>-Xdoclint:none</additionalJOption>
</additionalJOptions>
<doclint>none</doclint>
<failOnError>false</failOnError>
<detectOfflineLinks>false</detectOfflineLinks>
Expand Down
181 changes: 0 additions & 181 deletions src/main/java/org/glassfish/wasp/runtime/ExpressionEvaluatorImpl.java
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions src/main/java/org/glassfish/wasp/runtime/JspContextWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -45,8 +45,6 @@
import jakarta.servlet.jsp.JspContext;
import jakarta.servlet.jsp.JspWriter;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.el.ExpressionEvaluator;
import jakarta.servlet.jsp.el.VariableResolver;
import jakarta.servlet.jsp.tagext.BodyContent;
import jakarta.servlet.jsp.tagext.JspTag;

Expand Down Expand Up @@ -329,11 +327,6 @@ public void include(String relativeUrlPath, boolean flush) throws ServletExcepti
invokingJspCtxt.include(relativeUrlPath, flush);
}

@Override
public VariableResolver getVariableResolver() {
return null;
}

@Override
public BodyContent pushBody() {
return invokingJspCtxt.pushBody();
Expand All @@ -349,11 +342,6 @@ public JspWriter popBody() {
return invokingJspCtxt.popBody();
}

@Override
public ExpressionEvaluator getExpressionEvaluator() {
return invokingJspCtxt.getExpressionEvaluator();
}

@Override
public void handlePageException(Exception ex) throws IOException, ServletException {
// Should never be called since handleException() called with a
Expand Down
18 changes: 1 addition & 17 deletions src/main/java/org/glassfish/wasp/runtime/PageContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -64,12 +64,10 @@
import jakarta.servlet.jsp.JspFactory;
import jakarta.servlet.jsp.JspWriter;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.el.ExpressionEvaluator;
import jakarta.servlet.jsp.el.ImplicitObjectELResolver;
import jakarta.servlet.jsp.el.ImportELResolver;
import jakarta.servlet.jsp.el.NotFoundELResolver;
import jakarta.servlet.jsp.el.ScopedAttributeELResolver;
import jakarta.servlet.jsp.el.VariableResolver;
import jakarta.servlet.jsp.tagext.BodyContent;

/**
Expand Down Expand Up @@ -642,11 +640,6 @@ public void include(String relativeUrlPath, boolean flush) throws ServletExcepti
JspRuntimeLibrary.include(request, response, relativeUrlPath, out, flush);
}

@Override
public VariableResolver getVariableResolver() {
return new VariableResolverImpl(this);
}

private ELResolver getELResolver() {

if (elResolver == null) {
Expand Down Expand Up @@ -788,15 +781,6 @@ public JspWriter popBody() {
return out;
}

/**
* Provides programmatic access to the ExpressionEvaluator. The JSP Container must return a valid instance of an
* ExpressionEvaluator that can parse EL expressions.
*/
@Override
public ExpressionEvaluator getExpressionEvaluator() {
return new ExpressionEvaluatorImpl(this);
}

@Override
public void handlePageException(Exception ex) throws IOException, ServletException {
// Should never be called since handleException() called with a
Expand Down
Loading