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.

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

8277459: Add jwebserver tool #6497

Closed
wants to merge 16 commits into from
Closed

8277459: Add jwebserver tool #6497

wants to merge 16 commits into from

Conversation

FrauBoes
Copy link
Member

@FrauBoes FrauBoes commented Nov 22, 2021

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

Reviewers

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
Copy link

@bridgekeeper bridgekeeper bot commented Nov 22, 2021

👋 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
Copy link

@openjdk openjdk bot commented Nov 22, 2021

⚠️ @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
Copy link

@openjdk openjdk bot commented Nov 22, 2021

@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.

@openjdk openjdk bot added build net labels Nov 22, 2021
@FrauBoes FrauBoes changed the title Draft: Jwebserver 8277460: Add jwebserver tool Nov 23, 2021
@FrauBoes FrauBoes marked this pull request as ready for review Nov 24, 2021
@openjdk openjdk bot added the rfr label Nov 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 24, 2021

Webrevs

@FrauBoes
Copy link
Member Author

@FrauBoes FrauBoes commented Nov 24, 2021

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

@FrauBoes FrauBoes changed the title 8277460: Add jwebserver tool 8277459: Add jwebserver tool Nov 24, 2021
@magicus
Copy link
Member

@magicus magicus commented Nov 24, 2021

Build changes look good.

* update module and package summary
* add -version / --version option to usage
* fix markdown formatting
@openjdk openjdk bot removed the rfr label Nov 24, 2021
@openjdk openjdk bot added the rfr label Nov 24, 2021
Copy link
Member

@Michael-Mc-Mahon Michael-Mc-Mahon left a comment

LGTM

@openjdk
Copy link

@openjdk openjdk bot commented Nov 26, 2021

@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.

@openjdk openjdk bot added the ready label Nov 26, 2021
dfuch
dfuch approved these changes Nov 29, 2021
Copy link
Member

@dfuch dfuch left a comment

LGTM!

Copy link
Member

@magicus magicus left a comment

Build changes look good

@FrauBoes
Copy link
Member Author

@FrauBoes FrauBoes commented Dec 1, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2021

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 openjdk bot closed this Dec 1, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 1, 2021

@FrauBoes Pushed as commit f505396.

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

@FrauBoes FrauBoes deleted the jwebserver branch Dec 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build integrated net
4 participants