8277459: Add jwebserver tool #6497

FrauBoes · 2021-11-22T09:43:19Z

This change introduces jwebserver, a dedicated JDK tool for the Simple Web Server.

A description is provided in a follow-up comment.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8277459: Add jwebserver tool

Reviewers

Michael McMahon (@Michael-Mc-Mahon - Reviewer) ⚠️ Review applies to 60acea9
Daniel Fuchs (@dfuch - Reviewer) ⚠️ Review applies to 81499ef
Magnus Ihse Bursie (@magicus - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6497/head:pull/6497
$ git checkout pull/6497

Update a local copy of the PR:
$ git checkout pull/6497
$ git pull https://git.openjdk.java.net/jdk pull/6497/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6497

View PR using the GUI difftool:
$ git pr show -t 6497

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6497.diff

bridgekeeper · 2021-11-22T09:44:30Z

👋 Welcome back jboes! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-11-22T09:46:24Z

⚠️ @FrauBoes This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

openjdk · 2021-11-22T09:47:09Z

@FrauBoes The following labels will be automatically applied to this pull request:

build
net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

…l doc

mlbridge · 2021-11-24T10:43:29Z

Webrevs

FrauBoes · 2021-11-24T10:50:54Z

This change adds a dedicated command-line tool for the Simple Web Server, to improve convenience and approachability. The new tool jwebserver calls the main entry point of the jdk.httpserver module, thus hiding this implementation detail which is not hidden with java -m jdk.httpserver. The command-line options are identical, the only addition is support for -version / --version.

A man page for jwebserver is added and the module and package level documentation is updated to reflect the new tool.

A new internal class JWebServer is added to be able to distinguish whether the server was launched via jwebserver or java -m jdk.httpserver.

The new tests are copies of the existing command-line tests.

CSR: https://bugs.openjdk.java.net/browse/JDK-8277460

src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java

src/jdk.httpserver/share/classes/module-info.java

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java

...k.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver.properties

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java

magicus · 2021-11-24T12:49:25Z

Build changes look good.

* update module and package summary * add -version / --version option to usage * fix markdown formatting

src/jdk.httpserver/share/classes/module-info.java

Michael-Mc-Mahon

LGTM

openjdk · 2021-11-26T11:37:53Z

@FrauBoes This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8277459: Add jwebserver tool

Reviewed-by: michaelm, dfuchs, ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 11 new commits pushed to the master branch:

01cefc9: 8277977: Incorrect references to --enable-reproducible-builds in docs
69f56a0: 8264485: build.tools.depend.Depend.toString(byte[]) creates malformed hex strings
fecf906: 8267928: Loop predicate gets inexact loop limit before PhaseIdealLoop::rc_predicate
a5f2a58: 8277846: Implement fast-path for ASCII-compatible CharsetEncoders on ppc64
ceae380: 8277843: [Vector API] scalar2vector generates incorrect type info for mask operations if Op_MaskAll is unavailable
3ee26c6: 8267767: Redundant condition check in SafepointSynchronize::thread_not_running
d230fee: 8277931: Parallel: Remove unused PSVirtualSpace::expand_into
fde6fe7: 8277824: Remove empty RefProcSubPhasesWorkerTimeTracker destructor
27299ea: 8277803: vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001 fails with "Synthetic fields not found"
560f9c9: 8277426: Optimize mask reduction operations on x86
... and 1 more: https://git.openjdk.java.net/jdk/compare/825e633e71ca942fe88c509e7f951ff8903c45cf...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java

dfuch

LGTM!

magicus

Build changes look good

FrauBoes · 2021-12-01T10:35:31Z

/integrate

openjdk · 2021-12-01T10:37:19Z

Going to push as commit f505396.
Since your change was applied there have been 30 commits pushed to the master branch:

84aa0a1: 8278047: Few javax/imageio test regressed after JDK-8262297 fix
fde0b95: 8277861: Terminally deprecate Thread.stop
70d5dff: 8275326: C2: assert(no_dead_loop) failed: dead loop detected
349328c: 8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad
c733193: 8262297: ImageIO.write() method will throw IndexOutOfBoundsException
da2be99: 8277026: Remove blank lines remaining from snippet markup
0a01baa: 8277986: Typo in javadoc of java.util.zip.ZipEntry#setTime
7049c13: 8231107: Allow store password to be null when saving a PKCS12 KeyStore
ab867f6: 8272162: S4U2Self ticket without forwardable flag
dd73e3c: 8277814: ConcurrentRefineThread should report rate when deactivating
... and 20 more: https://git.openjdk.java.net/jdk/compare/825e633e71ca942fe88c509e7f951ff8903c45cf...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-12-01T10:37:34Z

@FrauBoes Pushed as commit f505396.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Julia Boes added 7 commits November 18, 2021 09:02

initial commit

8c01dc7

initial commit

cd9ca3b

merge origin/jwebserver into jwebserver

4204ae5

update troffl file

f377520

update markdown

475fc51

Merge branch 'master' into jwebserver

92cbc9b

drop "tool" in man page

4b856d3

openjdk bot added build build-dev@openjdk.org net net-dev@openjdk.org labels Nov 22, 2021

add version option, consolidate tests, update module and package leve…

b995489

…l doc

FrauBoes changed the title ~~Draft: Jwebserver~~ 8277460: Add jwebserver tool Nov 23, 2021

Julia Boes added 2 commits November 24, 2021 09:34

Merge branch 'master' into jwebserver

9255e0a

update module summary

80b5584

FrauBoes marked this pull request as ready for review November 24, 2021 10:37

openjdk bot added the rfr Pull request is ready for review label Nov 24, 2021

FrauBoes changed the title ~~8277460: Add jwebserver tool~~ 8277459: Add jwebserver tool Nov 24, 2021

dfuch reviewed Nov 24, 2021

View reviewed changes

...k.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver.properties Outdated Show resolved Hide resolved

magicus reviewed Nov 24, 2021

View reviewed changes

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java Outdated Show resolved Hide resolved

address PR comments:

513c5a1

* update module and package summary * add -version / --version option to usage * fix markdown formatting

openjdk bot removed the rfr Pull request is ready for review label Nov 24, 2021

dfuch reviewed Nov 24, 2021

View reviewed changes

src/jdk.httpserver/share/classes/module-info.java Outdated Show resolved Hide resolved

fix whitespace error, add missing code tag

60acea9

openjdk bot added the rfr Pull request is ready for review label Nov 24, 2021

Michael-Mc-Mahon approved these changes Nov 26, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 26, 2021

Julia Boes added 2 commits November 29, 2021 11:16

Merge branch 'master' into jwebserver

4964d6e

add toolGuide tag to SimpleFileServer class-level documentation

dc1ac2d

dfuch reviewed Nov 29, 2021

View reviewed changes

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java Outdated Show resolved Hide resolved

update comment about exit code

81499ef

dfuch approved these changes Nov 29, 2021

View reviewed changes

Merge branch 'master' into jwebserver

936c3d4

magicus approved these changes Nov 30, 2021

View reviewed changes

openjdk bot closed this Dec 1, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 1, 2021

FrauBoes deleted the jwebserver branch December 1, 2021 10:44

8277459: Add jwebserver tool #6497

8277459: Add jwebserver tool #6497

Uh oh!

Conversation

FrauBoes commented Nov 22, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 22, 2021

Uh oh!

openjdk bot commented Nov 22, 2021

Uh oh!

openjdk bot commented Nov 22, 2021

Uh oh!

mlbridge bot commented Nov 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

FrauBoes commented Nov 24, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

magicus commented Nov 24, 2021

Uh oh!

Uh oh!

Michael-Mc-Mahon left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Nov 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

dfuch left a comment

Choose a reason for hiding this comment

Uh oh!

magicus left a comment

Choose a reason for hiding this comment

Uh oh!

FrauBoes commented Dec 1, 2021

Uh oh!

openjdk bot commented Dec 1, 2021

Uh oh!

openjdk bot commented Dec 1, 2021

Uh oh!

Uh oh!

FrauBoes commented Nov 22, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 24, 2021 •

edited

Loading

openjdk bot commented Nov 26, 2021 •

edited

Loading