Issue #3162 - Use Jetty specific Servlet API jar. #3168

sbordet · 2018-11-29T15:52:42Z

Updated module-info.java to reference the "jetty.servlet.api" module.
Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
Removed references to jetty-schemas.jar.
Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet simone.bordet@gmail.com

* Updated module-info.java to reference the "jetty.servlet.api" module. * Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact. * Removed references to jetty-schemas.jar. * Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" to match the new Jetty Servlet API jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

joakime · 2018-11-29T16:16:37Z

jetty-server/src/main/config/modules/server.mod

@@ -13,8 +13,7 @@ logging
 threadpool

 [lib]
-lib/servlet-api-4.0.jar
-lib/jetty-schemas-4.0.jar
+lib/jetty-servlet-api-4.0.0-SNAPSHOT.jar


Change this to lib/jetty-servlet-api-4.*.jar

joakime · 2018-11-29T16:28:48Z

NOTICE.txt

@@ -105,7 +105,7 @@ The following artifacts are CDDL + GPLv2 with classpath exception.

 https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html

-org.eclipse.jetty.toolchain:jetty-schemas
+org.eclipse.jetty.toolchain:jetty-servlet-api


@jmcc0nn3ll and @janbartel since this new artifact jetty-servlet-api is now ...

CDDL

and GPLv2 with Classpath Exception

and Eclipse License

and Apache License

... wouldn't we need to update this NOTICE file as well?

Or are the other sections of the NOTICE.txt sufficient for this?

@joakime actually, our standard NOTICE file covers everything already, so that's the one that we should use.

Future proof reference of the jetty-servlet-api.jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Removed references to jetty-osgi-servlet-api. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…ng in the way) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…ke on Windows, or within an IDE) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

…t (client) on OSGi Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

janbartel · 2019-01-16T03:37:05Z

@sbordet what's happening on this pr?

janbartel · 2019-01-30T03:27:59Z

Now I'm confused: why is this PR for servlet-api 3 when it is targeted for jetty-10???

joakime · 2019-01-30T03:42:22Z

@janbartel the original goal of this PR is to have a servlet-api jar that is JPMS friendly.
There's a "jetty" servlet api jar that is Servlet 4.0 with JPMS friendly manifest.
https://oss.sonatype.org/content/repositories/jetty-snapshots/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.1-SNAPSHOT/

Where do you see the Servlet 3.0 stuff?

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java

...y-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java

.../jetty-osgi-boot/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration

...st-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java

...t-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java

pom.xml

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java

...mentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc

…3162_jetty_servlet_api Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-client/pom.xml # jetty-http/pom.xml # jetty-http2/http2-client/pom.xml # jetty-http2/http2-http-client-transport/pom.xml # jetty-http2/http2-server/pom.xml # jetty-osgi/test-jetty-osgi/pom.xml # jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml # jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java # jetty-quickstart/pom.xml # jetty-servlets/pom.xml # jetty-util/pom.xml # jetty-websocket/javax-websocket-client/pom.xml # jetty-websocket/javax-websocket-server/pom.xml # jetty-websocket/jetty-websocket-server/pom.xml # pom.xml

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Introduced ClientConnector and refactored HttpClient transports, removing duplicated code that was connect() to a remote host. Refactored also HTTP2Client to reference ClientConnector. Refactored tests accordingly to the changes introduced in the implementations. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Added name to default executor and scheduler after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Reverted refactoring of newConnection() to avoid to bind the class to a too specific abstract method. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

…ache.org/jira/browse/MINVOKER-247 Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* Updated module-info.java to reference the "jetty.servlet.api" module. * Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact. * Removed references to jetty-schemas.jar. * Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" to match the new Jetty Servlet API jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Removed references to jetty-osgi-servlet-api. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc

…3162_jetty_servlet_api

Updated references to Servlet jar to "jetty-servlet-api". Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

joakime

I'm good with the current state of the PR

sbordet · 2019-02-07T16:31:26Z

@janbartel I have addressed your concerns with "containerIncludeJarPattern".

Fixed your concerns.

joakime · 2019-02-07T16:34:10Z

...mentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc

@@ -65,7 +65,7 @@ Jetty Server Classpath:
 Version Information on 11 entries in the classpath.
 Note: order presented here is how they would appear on the classpath.
      changes to the --module=name command line options will be reflected here.
- 0:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 0:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar


whoops. missed the version identifier before the |

joakime · 2019-02-07T16:34:30Z

jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc

@@ -158,7 +158,7 @@ Note: order presented here is how they would appear on the classpath.
 1:      1.4.1.v201005082020 | ${jetty.base}/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
 2:          {VERSION} | ${jetty.base}/lib/ext/test-mock-resources-{VERSION}.jar
 3:                    (dir) | ${jetty.home}/resources
- 4:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 4:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar


ditto, the version s/3.1.0/4.0.2/

joakime · 2019-02-07T16:34:52Z

jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc

@@ -162,7 +162,7 @@ Jetty Server Classpath:
 Version Information on 7 entries in the classpath.
 Note: order presented here is how they would appear on the classpath.
      changes to the --module=name command line options will be reflected here.
- 0:                    3.1.0 | ${jetty.home}/lib/servlet-api-3.1.jar
+ 0:                    3.1.0 | ${jetty.home}/lib/jetty-servlet-api-4.0.2.jar


here too. s/3.1.0/4.0.2/

sbordet requested review from gregw and joakime November 29, 2018 15:52

joakime requested changes Nov 29, 2018

View reviewed changes

joakime reviewed Nov 29, 2018

View reviewed changes

sbordet and others added 15 commits November 29, 2018 17:29

Issue #3162 - Use Jetty specific Servlet API jar.

707c9ec

Future proof reference of the jetty-servlet-api.jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Issue #3162 - Use Jetty specific Servlet API jar.

8ff8242

Removed references to jetty-osgi-servlet-api. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Issue #3162 - Correcting websocket issues in OSGi

c3348a0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Fixing OSGi manifest for websocket

85f74f1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - correcting typo

e0f4e5a

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - correcting logger name

e16e3f1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Adding missing Configuration reference

7f6add5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Updating XML (removing references that seem to be getti…

db11be0

…ng in the way) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Correcting package name exposure (missing 's')

01e1f01

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Making dependents OSGi aware

231892e

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Introducing more convenience Options for PaxExam

24e680e

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Fail test early if conscrypt-version is undefined (li…

97bba2e

…ke on Windows, or within an IDE) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Fixing testcase assertions

7262bfd

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Attempting to address ServiceLoader with javax.websocke…

435dd20

…t (client) on OSGi Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 Partial fix for javaxwebsocket in osgi, wip.

1167adf

janbartel requested changes Jan 30, 2019

View reviewed changes

joakime and others added 6 commits January 30, 2019 11:56

Issue #3162 - Using snapshot repositories on CI (temporary)

755d572

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Reverting not-relevant OSGi changes

26fa79a

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Reverting not-relevant JspConfig change.

c25cbf3

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #132 - ClientConnector abstraction.

64a2bc3

Added name to default executor and scheduler after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

sbordet and others added 12 commits February 4, 2019 18:49

Issue #132 - ClientConnector abstraction.

51730a7

Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Issue #132 - ClientConnector abstraction.

514c6df

Reverted refactoring of newConnection() to avoid to bind the class to a too specific abstract method. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

use snapshot of maven-invoker-plugin because of NPE https://issues.ap…

d8d1ecf

…ache.org/jira/browse/MINVOKER-247 Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix merge

b9281e3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Issue #3162 - Use Jetty specific Servlet API jar.

66f8259

Removed references to jetty-osgi-servlet-api. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Issue #3162 - Correcting websocket issues in OSGi

95bc15f

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Introducing more convenience Options for PaxExam

e135197

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Reverting not-relevant OSGi changes

72ad748

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Issue #3162 - Use Jetty specific Servlet API jar.

33f314e

Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Issue #3162 - Use Jetty specific Servlet API jar.

107170a

Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'.

cd488c2

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

janbartel previously requested changes Feb 4, 2019

View reviewed changes

jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc Outdated Show resolved Hide resolved

joakime added 3 commits February 4, 2019 19:32

Issue #3162 - Fixing compilation issues

b09f1de

Issue #3162 - Correcting javadoc

e4df1fe

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

0817928

…3162_jetty_servlet_api

sbordet mentioned this pull request Feb 7, 2019

Jetty 10 standalone cannot start on the module-path #3333

Closed

Issue #3162 - Use Jetty specific Servlet API jar.

9286cdc

Updated references to Servlet jar to "jetty-servlet-api". Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

joakime approved these changes Feb 7, 2019

View reviewed changes

sbordet merged commit e2506d4 into jetty-10.0.x Feb 7, 2019

sbordet deleted the jetty-10.0.x-3162_jetty_servlet_api branch February 7, 2019 16:33

joakime reviewed Feb 7, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Issue #3162 - Use Jetty specific Servlet API jar. #3168

sbordet commented Nov 29, 2018

joakime Nov 29, 2018

joakime Nov 29, 2018 •

edited

Loading

janbartel Nov 29, 2018

janbartel commented Jan 16, 2019

janbartel commented Jan 30, 2019

joakime commented Jan 30, 2019

joakime left a comment

sbordet commented Feb 7, 2019

joakime Feb 7, 2019

joakime Feb 7, 2019

joakime Feb 7, 2019

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Conversation

sbordet commented Nov 29, 2018

joakime Nov 29, 2018

Choose a reason for hiding this comment

joakime Nov 29, 2018 • edited Loading

Choose a reason for hiding this comment

janbartel Nov 29, 2018

Choose a reason for hiding this comment

janbartel commented Jan 16, 2019

janbartel commented Jan 30, 2019

joakime commented Jan 30, 2019

joakime left a comment

Choose a reason for hiding this comment

sbordet commented Feb 7, 2019

joakime Feb 7, 2019

Choose a reason for hiding this comment

joakime Feb 7, 2019

Choose a reason for hiding this comment

joakime Feb 7, 2019

Choose a reason for hiding this comment

joakime Nov 29, 2018 •

edited

Loading