Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Lachlan Roberts 2023-07-24 22:37:03 +10:00
parent 745ee46ebe 9e16d81cf8
commit d7a8516a01
182 changed files with 919 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/config.yml vendored
View File

@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Jetty Security Reports
url: https://www.eclipse.org/jetty/security_reports.php
url: https://eclipse.dev/jetty/security_reports.php
about: Please raise security issues here.

4
.github/ISSUE_TEMPLATE/issue-template.md vendored
View File

@ -8,14 +8,14 @@ labels: Bug
---
**Jetty version(s)**
_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_
<!--[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958) -->
**Java version/vendor** `(use: java -version)`
**OS type/version**
**Description**
_Do not report security issues here! See [Jetty Security Reports](https://www.eclipse.org/jetty/security_reports.php)._
<!-- Do not report security issues here! See [Jetty Security Reports](https://eclipse.dev/jetty/security_reports.php) -->
**How to reproduce?**

2
.github/ISSUE_TEMPLATE/release-template.md vendored
View File

@ -56,7 +56,7 @@ This release process will produce releases:
- [ ] Merge release branches back to main branches and delete release branches.
- [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD.
- [ ] Update Jetty versions on the web sites.
+ [ ] Update (or check) [Download](https://www.eclipse.org/jetty/download.php) page is updated.
+ [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated.
+ [ ] Update (or check) documentation page(s) are updated.
- [ ] Publish GitHub Releases in the order of oldest (eg: 9) to newest (eg: 11) (to ensure that "latest" in github is truly the latest)
- [ ] Prepare release announcement for mailing lists.

93
CODE_OF_CONDUCT.md Normal file
View File

@ -0,0 +1,93 @@
# Community Code of Conduct
**Version 2.0
January 1, 2023**
## Our Pledge
In the interest of fostering an open and welcoming environment, we as community members, contributors, Committers[^1], and Project Leads (collectively "Contributors") pledge to make participation in our projects and our community a harassment-free and inclusive experience for everyone.
This Community Code of Conduct ("Code") outlines our behavior expectations as members of our community in all Eclipse Foundation activities, both offline and online. It is not intended to govern scenarios or behaviors outside of the scope of Eclipse Foundation activities. Nor is it intended to replace or supersede the protections offered to all our community members under the law. Please follow both the spirit and letter of this Code and encourage other Contributors to follow these principles into our work. Failure to read or acknowledge this Code does not excuse a Contributor from compliance with the Code.
## Our Standards
Examples of behavior that contribute to creating a positive and professional environment include:
- Using welcoming and inclusive language;
- Actively encouraging all voices;
- Helping others bring their perspectives and listening actively. If you find yourself dominating a discussion, it is especially important to encourage other voices to join in;
- Being respectful of differing viewpoints and experiences;
- Gracefully accepting constructive criticism;
- Focusing on what is best for the community;
- Showing empathy towards other community members;
- Being direct but professional; and
- Leading by example by holding yourself and others accountable
Examples of unacceptable behavior by Contributors include:
- The use of sexualized language or imagery;
- Unwelcome sexual attention or advances;
- Trolling, insulting/derogatory comments, and personal or political attacks;
- Public or private harassment, repeated harassment;
- Publishing others' private information, such as a physical or electronic address, without explicit permission;
- Violent threats or language directed against another person;
- Sexist, racist, or otherwise discriminatory jokes and language;
- Posting sexually explicit or violent material;
- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history;
- Personal insults, especially those using racist or sexist terms;
- Excessive or unnecessary profanity;
- Advocating for, or encouraging, any of the above behavior; and
- Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
With the support of the Eclipse Foundation employees, consultants, officers, and directors (collectively, the "Staff"), Committers, and Project Leads, the Eclipse Foundation Conduct Committee (the "Conduct Committee") is responsible for clarifying the standards of acceptable behavior. The Conduct Committee takes appropriate and fair corrective action in response to any instances of unacceptable behavior.
## Scope
This Code applies within all Project, Working Group, and Interest Group spaces and communication channels of the Eclipse Foundation (collectively, "Eclipse spaces"), within any Eclipse-organized event or meeting, and in public spaces when an individual is representing an Eclipse Foundation Project, Working Group, Interest Group, or their communities. Examples of representing a Project or community include posting via an official social media account, personal accounts, or acting as an appointed representative at an online or offline event. Representation of Projects, Working Groups, and Interest Groups may be further defined and clarified by Committers, Project Leads, or the Staff.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via conduct@eclipse-foundation.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.
Staff, Committers and Project Leads have the right to report, remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code, or to block temporarily or permanently any Contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. Any such actions will be reported to the Conduct Committee for transparency and record keeping.
Any Staff (including officers and directors of the Eclipse Foundation), Committers, Project Leads, or Conduct Committee members who are the subject of a complaint to the Conduct Committee will be recused from the process of resolving any such complaint.
## Responsibility
The responsibility for administering this Code rests with the Conduct Committee, with oversight by the Executive Director and the Board of Directors. For additional information on the Conduct Committee and its process, please write to <conduct@eclipse-foundation.org>.
## Investigation of Potential Code Violations
All conflict is not bad as a healthy debate may sometimes be necessary to push us to do our best. It is, however, unacceptable to be disrespectful or offensive, or violate this Code. If you see someone engaging in objectionable behavior violating this Code, we encourage you to address the behavior directly with those involved. If for some reason, you are unable to resolve the matter or feel uncomfortable doing so, or if the behavior is threatening or harassing, please report it following the procedure laid out below.
Reports should be directed to <conduct@eclipse-foundation.org>. It is the Conduct Committee’s role to receive and address reported violations of this Code and to ensure a fair and speedy resolution.
The Eclipse Foundation takes all reports of potential Code violations seriously and is committed to confidentiality and a full investigation of all allegations. The identity of the reporter will be omitted from the details of the report supplied to the accused. Contributors who are being investigated for a potential Code violation will have an opportunity to be heard prior to any final determination. Those found to have violated the Code can seek reconsideration of the violation and disciplinary action decisions. Every effort will be made to have all matters disposed of within 60 days of the receipt of the complaint.
## Actions
Contributors who do not follow this Code in good faith may face temporary or permanent repercussions as determined by the Conduct Committee.
This Code does not address all conduct. It works in conjunction with our [Communication Channel Guidelines](https://www.eclipse.org/org/documents/communication-channel-guidelines/), [Social Media Guidelines](https://www.eclipse.org/org/documents/social_media_guidelines.php), [Bylaws](https://www.eclipse.org/org/documents/eclipse-foundation-be-bylaws-en.pdf), and [Internal Rules](https://www.eclipse.org/org/documents/ef-be-internal-rules.pdf) which set out additional protections for, and obligations of, all contributors. The Foundation has additional policies that provide further guidance on other matters.
It’s impossible to spell out every possible scenario that might be deemed a violation of this Code. Instead, we rely on one another’s good judgment to uphold a high standard of integrity within all Eclipse Spaces. Sometimes, identifying the right thing to do isn’t an easy call. In such a scenario, raise the issue as early as possible.
## No Retaliation
The Eclipse community relies upon and values the help of Contributors who identify potential problems that may need to be addressed within an Eclipse Space. Any retaliation against a Contributor who raises an issue honestly is a violation of this Code. That a Contributor has raised a concern honestly or participated in an investigation, cannot be the basis for any adverse action, including threats, harassment, or discrimination. If you work with someone who has raised a concern or provided information in an investigation, you should continue to treat the person with courtesy and respect. If you believe someone has retaliated against you, report the matter as described by this Code. Honest reporting does not mean that you have to be right when you raise a concern; you just have to believe that the information you are providing is accurate.
False reporting, especially when intended to retaliate or exclude, is itself a violation of this Code and will not be accepted or tolerated.
Everyone is encouraged to ask questions about this Code. Your feedback is welcome, and you will get a response within three business days. Write to <conduct@eclipse-foundation.org>.
## Amendments
The Eclipse Foundation Board of Directors may amend this Code from time to time and may vary the procedures it sets out where appropriate in a particular case.
### Attribution
This Code was inspired by the [Contributor Covenant](https://www.contributor-covenant.org/), version 1.4, available [here](https://www.contributor-covenant.org/version/1/4/code-of-conduct/).
[^1]: Capitalized terms used herein without definition shall have the meanings assigned to them in the Bylaws.

2
CONTRIBUTING.md
View File

@ -14,7 +14,7 @@ Developer resources
--------------------
Information regarding source code management, builds, coding standards, and more.
- [https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html](https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html)
- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)
The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have
completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper.

2
NOTICE.txt
View File

@ -2,7 +2,7 @@ Notices for Eclipse Jetty
=========================
This content is produced and maintained by the Eclipse Jetty project.
Project home: https://www.eclipse.org/jetty/
Project home: https://eclipse.dev/jetty/
Trademarks
----------

2
README.md
View File

@ -41,7 +41,7 @@ Documentation
Project documentation is available on the Jetty Eclipse website.
- [https://www.eclipse.org/jetty/documentation](https://www.eclipse.org/jetty/documentation)
- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)
Building
========

4
SECURITY.md
View File

@ -2,7 +2,7 @@
## Supported Versions
All [stable versions](https://www.eclipse.org/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://www.eclipse.org/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
All [stable versions](https://eclipse.dev/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://eclipse.dev/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
## Reporting a Vulnerability
@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me
## Handling a Vulnerability
The [following checklist](https://www.eclipse.org/jetty/security_processes.php) is used to handle security issues:
The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues:
- [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership.
- [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks.

2
apache-jsp/src/main/config/modules/apache-jsp.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables use of the apache implementation of JSP.

2
apache-jstl/src/main/config/modules/apache-jstl.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the apache version of JSTL for all webapps.

2
build-resources/pom.xml
View File

@ -17,7 +17,7 @@
<maven.deploy.plugin.version>3.0.0-M2</maven.deploy.plugin.version>
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.1.0</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>

2
demos/demo-async-rest/demo-async-rest-webapp/src/main/config/modules/demo-async-rest.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo Async Rest webapp

4
demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html
View File

@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-async-rest">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

2
demos/demo-jaas-webapp/src/main/config/modules/demo-jaas.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo Spec webapp

6
demos/demo-jaas-webapp/src/main/webapp/index.html
View File

@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
@ -21,7 +21,7 @@
</center>
<h1>JAAS Demo</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
It uses a simple login module that stores its configuration in a properties file.
</p>

4
demos/demo-jaas-webapp/src/main/webapp/login.html
View File

@ -7,8 +7,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
<div class="content">

2
demos/demo-jetty-webapp/src/main/config/modules/demo-jetty.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo Jetty Webapp

2
demos/demo-jetty-webapp/src/main/config/modules/demo-moved-context.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demonstrate a Moved Context Handler.

2
demos/demo-jetty-webapp/src/main/config/modules/demo-rewrite.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demonstrate the rewrite module.

4
demos/demo-jetty-webapp/src/main/webapp/auth.html
View File

@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

6
demos/demo-jetty-webapp/src/main/webapp/index.html
View File

@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
@ -20,7 +20,7 @@
</center>
<h1>Eclipse Jetty Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>
<h2>Jetty Tests:</h2>

4
demos/demo-jetty-webapp/src/main/webapp/remote.html
View File

@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

4
demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html
View File

@ -10,8 +10,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

2
demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo JNDI Resources Webapp

6
demos/demo-jndi-webapp/src/main/webapp/index.html
View File

@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jndi-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
@ -20,7 +20,7 @@
</center>
<h1>Eclipse Jetty JNDI Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>
<p>

6
demos/demo-jsp-webapp/src/main/webapp/index.jsp
View File

@ -11,8 +11,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jsp-webapp">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>
@ -22,7 +22,7 @@
</center>
<h1>Eclipse Jetty JSP Demo Webapp</h1>
<p>
This is a demo webapp for the <a href="http://www.eclipse.org/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
This is a demo webapp for the <a href="https://eclipse.dev/jetty/">Eclipse Jetty HTTP Server and Servlet Container</a>. It was added into your <code>$JETTY_BASE/webapps</code> directory.
</p>
<h2>JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %></h2>

2
demos/demo-mock-resources/src/main/config/modules/demo-mock-resources.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Download and install some Demo Mock Resources

2
demos/demo-proxy-webapp/src/main/config/modules/demo-proxy.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo Proxy Webapp

2
demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
View File

@ -13,7 +13,7 @@
<servlet-class>org.eclipse.jetty.proxy.ProxyServlet$Transparent</servlet-class>
<init-param>
<param-name>proxyTo</param-name>
<param-value>https://www.eclipse.org/jetty/javadoc/jetty-10/index.html?overview-summary.html</param-value>
<param-value>https://eclipse.dev/jetty/javadoc/jetty-10/index.html?overview-summary.html</param-value>
</init-param>
<init-param>
<param-name>hostHeader</param-name>

2
demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo-spec.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Download and deploy the Test Spec webapp demo.

4
demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html
View File

@ -9,8 +9,8 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-spec">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

4
demos/demo-template/src/main/resources/index.html
View File

@ -11,8 +11,8 @@
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/XXX">Source</a>
<a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a>
<a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
</div>

2
demos/embedded/src/main/resources/demo/webdefault.xml
View File

@ -195,7 +195,7 @@
<!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by the jsp container to support JSP pages. Traditionally, -->
<!-- this servlet is mapped to URL pattern "*.jsp". -->
<!-- See http://https://www.eclipse.org/jetty/documentation/ -->
<!-- See https://eclipse.dev/jetty/documentation/ -->
<!-- for applicable configuration params. -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet id="jsp">

2
documentation/jetty-documentation/pom.xml
View File

@ -72,7 +72,7 @@
<version>${project.version}</version>
<prog-guide>../programming-guide/index.html</prog-guide>
<op-guide>../operations-guide/index.html</op-guide>
<javadoc-url>https://www.eclipse.org/jetty/javadoc/jetty-10</javadoc-url>
<javadoc-url>https://eclipse.dev/jetty/javadoc/jetty-10</javadoc-url>
</attributes>
</configuration>
<executions>

27
documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
View File

@ -26,12 +26,13 @@ The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located a
.Active Eclipse Jetty Branches
[cols="4"]
|===
| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development | Servlet 6.0 | Java 17+
| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development (default branch) | Servlet 4.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance | Servlet 3.1 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance | Servlet 3.0 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical | Servlet 2.0 | Java 7
| https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Mythical | Servlet 1.0 | Java 6
| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | End of Community Support | Servlet 3.1 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | End of Life | Servlet 3.1 | Java 8
| jetty-8 | Historical | Servlet 3.1 | Java 6
| jetty-7 | Mythical | Servlet 2.5 | Java 5
|===
If you are planning on working with a specific issue within Jetty it is important to target the correct branch for a pull request. Pull requests that are targeted at Maintenance Branches are typically merged forward into subsequent branches while historical branches are left alone merge wise. Depending on the nature of an issue a historical branch may have an issue cherrypicked forward, but maintenance releases are merged wholesale forward as a matter of project policy.
@ -52,8 +53,6 @@ Administrative pom.xml file::
https://github.com/eclipse/jetty.parent
Build related artifacts that release separately, common assembly descriptors, remote resources, etc.::
https://github.com/eclipse/jetty.toolchain
Files associated with the development of Jetty -- code styles, formatting, iplogs, etc.::
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git
[[cg-contributing-build]]
=== Maven Build
@ -88,17 +87,15 @@ ____
Jetty uses number of conventions for its source code. The developers of Jetty use a variety of tooling and editors when developing Jetty so standards and conventions are important!
==== Intelli-J
==== IntelliJ IDE
The suggested configuration for Intelli-J when working with Jetty is available here: http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/idea-jetty-codestyle-settings.jar[Intelli-J Codestyle]
The suggested configuration for the IntelliJ IDE when working with Jetty is available in the code tree
`/build-resources/jetty-codestyle-intellij.xml`
==== Eclipse
==== Eclipse IDE
The Eclipse format configuration can be found here:
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-java-format.xml[Eclipse Java Formatting]
There are also some templates available for Eclipse here:
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-codetemplates.xml[Eclipse Code Templates]
The Eclipse IDE format can be found in the code tree
`/build-resources/jetty-codestyle-eclipse-ide.xml`
==== Code Conventions

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc
View File

@ -17,7 +17,7 @@
==== Setting up the Classpath
You will need to place the following Jetty jar files onto the classpath of your application.
You can obtain them from the https://www.eclipse.org/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]:
You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]:
....
jetty-plus.jar

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc
View File

@ -32,7 +32,7 @@ Its purpose is to provide almost the same functionality as the Jetty plugin for
To set up your project for Ant to run Jetty, you need a Jetty distribution and the jetty-ant Jar:
1. https://www.eclipse.org/jetty/download.html[Download] a Jetty distribution and unpack it in the local filesystem.
1. https://eclipse.dev/jetty/download.php[Download] a Jetty distribution and unpack it in the local filesystem.
2. https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-ant/[Get] the jetty-ant Jar.
3. Make a directory in your project called `jetty-lib/`.
4. Copy all of the Jars in your Jetty distribution's `lib` directory, and all its subdirectories, into your new `jetty-lib` dir.

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc
View File

@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu
____
[NOTE]
There is a separate Jenkins build job that publishes documentation to https://www.eclipse.org/jetty/documentation/current triggered by a push of changed files to the jetty-documentation project.
There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project.
If you commit your change to the <version> number from step 2, then these builds will use the same release version number.
It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number.
____

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
View File

@ -69,7 +69,7 @@ A fifth, non-standard binding, called link:{JDURL}/org/eclipse/jetty/deploy/bind
===== Using GlobalWebappConfigBinding
In addition to the LifeCycle bindings discussed above, there is also the link:https://www.eclipse.org/jetty/javadoc/current/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.html[`GlobalWebappConfigBinding`] which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys.
In addition to the LifeCycle bindings discussed above, there is also the `GlobalWebappConfigBinding` which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys.
This can useful when setting server or system classes, or when defining link:#override-web-xml[override descriptors.]
This configuration XML file will be _in addition to_ any context XML file that exists for the webapp; it will be applied _after_ any context XML files but _before_ the webapp is started.
The format for the XML file is the same as any context XML file and can be used to same parameters for a webapp.

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
View File

@ -24,7 +24,7 @@ In addition, the infrastructure also supports the OSGi `HttpService` interface.
All of the Jetty jars contain manifest entries appropriate to ensure that they can be deployed into an OSGi container as bundles.
You will need to install some jetty jars into your OSGi container.
You can always find the Jetty jars either in the Maven Central repository, or you can link:https://www.eclipse.org/jetty/download.html[download] a distribution of Jetty.
You can always find the Jetty jars either in the Maven Central repository, or you can link:https://eclipse.dev/jetty/download.php[download] a distribution of Jetty.
Here's the absolute minimal set of Jetty jars:
.Minimal Bundles

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc
View File

@ -19,7 +19,7 @@
The standalone Jetty distribution is available for download from the Eclipse Foundation:
____
*Jetty*
https://www.eclipse.org/jetty/download.html
https://eclipse.dev/jetty/download.php
____
It is available in both zip and gzip formats; download the one most appropriate for your system.

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc
View File

@ -24,7 +24,7 @@ To start Jetty on the default port of 8080, run the following command:
----
$ java -jar start.jar
2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog
2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html
2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/
2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION}
2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1
2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot
View File

@ -1,7 +1,7 @@
/*
* GraphViz Graph of Jetty Modules
*
* Jetty: https://eclipse.org/jetty/
* Jetty: https://eclipse.dev/jetty/
* GraphViz: http://graphviz.org/
*
* To Generate Graph image using graphviz:

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc
View File

@ -20,7 +20,7 @@ In addition to using Jetty in its distribution form and its multiple embedded fo
Many products and open source projects out there distribute Jetty themselves, in both distribution and embedded forms, not to mention different operating systems bundling Jetty in other installable forms.
If your platform supports Jetty from a distribution or deployment perspective and want to be included on this list just fork the documentation and submit a pull request, or contact us.
Check out our list of http://www.eclipse.org/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways.
Check out our list of https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways.
include::jelastic.adoc[]
include::cloudfoundry.adoc[]

4
documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc
View File

@ -69,7 +69,7 @@ The default Configuration Classes are:
`org.eclipse.jetty.plus.webapp.PlusConfiguration`
`org.eclipse.jetty.annotations.AnnotationConfiguration`
You can learn more about implementing specific Configuration Classes link:https://www.eclipse.org/jetty/documentation/current/configuring-webapps.html#webapp-configurations[here.]
You can learn more about implementing specific Configuration Classes link:https://eclipse.dev/jetty/documentation/[in the Jetty documentation.]
==== Deploying Multiple Contexts
@ -249,7 +249,7 @@ Here's an example of configuring a single extra classes dir:
____
[NOTE]
When using the `--jar` and/or `--lib` arguments, by default these will *not* be inspected for `META-INF` information such as `META-INF/resources`, `META-INF/web-fragment.xml`, or `META-INF/taglib.tld`.
If you require these jar files inspected you will need to define the link:https://www.eclipse.org/jetty/documentation/current/configuring-webapps.html#webapp-context-attributes[jar pattern in your context xml file].
If you require these jar files inspected you will need to define the jar pattern in your context xml file.
Jetty-Runner automatically provides and appends a suitable pattern for jtsl taglibs (this pattern is different than the one in the standard Jetty distribution).
____

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc
View File

@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule
An example webapp using JAAS can be found in the Jetty GitHub repository:
* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-9.4.x/tests/test-webapps/test-jaas-webapp]
* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp]

2
documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc
View File

@ -16,7 +16,7 @@
==== List of Security Reports
A current list of Jetty security reports can be viewed on the link:https://www.eclipse.org/jetty/security-reports.html[Project Home Page.]
A current list of Jetty security reports can be viewed on the link:https://eclipse.dev/jetty/security-reports.php[Project Home Page.]
==== Reporting Security Issues

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc
View File

@ -14,7 +14,7 @@
[[og-begin-download]]
==== Downloading Jetty
The Eclipse Jetty distribution is available for download from link:https://www.eclipse.org/jetty/download.html[]
The Eclipse Jetty distribution is available for download from link:https://eclipse.dev/jetty/download.php[]
The Eclipse Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems.

3
documentation/jetty-documentation/src/main/asciidoc/programming-guide/client/http/client-http-api.adoc
View File

@ -48,6 +48,9 @@ include::../../{doc_code}/org/eclipse/jetty/docs/programming/client/http/HTTPCli
You first create a request object using `httpClient.newRequest(...)`, and then you customize it using the fluent API style (that is, a chained invocation of methods on the request object).
When the request object is customized, you call `request.send()` that produces the `ContentResponse` when the request/response conversation is complete.
IMPORTANT: The `Request` object, despite being mutable, cannot be reused for other requests.
This is true also when trying to send two or more identical requests: you have to create two or more `Request` objects.
Simple `POST` requests also have a shortcut method:
[source,java,indent=0]

2
jetty-annotations/src/main/config/modules/annotations.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables Annotation scanning for deployed web applications.

2
jetty-cdi/src/main/config/modules/cdi-decorate.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.

2
jetty-cdi/src/main/config/modules/cdi-spi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.

2
jetty-cdi/src/main/config/modules/cdi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Provides integration of CDI within webapp to Jetty container object lifecycles.

2
jetty-client/src/main/config/modules/client.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the Jetty HTTP client to the server classpath.

10
jetty-client/src/main/java/org/eclipse/jetty/client/ProxyConfiguration.java
View File

@ -41,10 +41,18 @@ public class ProxyConfiguration
private final List<Proxy> proxies = new BlockingArrayQueue<>();
/**
* <p>Returns the list of proxies added to this configuration.</p>
* <p>This method is deprecated because it has historically been
* used to add/remove proxies directly to/from the returned list,
* but this has now been replaced by {@link #addProxy(Proxy)} and
* {@link #removeProxy(Proxy)} instead.</p>
* <p>In the future, this method will return an unmodifiable
* list of proxies just for querying purposes.</p>
*
* @deprecated use {@link #addProxy(Proxy)} and {@link #removeProxy(Proxy)} instead
* @return the forward proxies to use
*/
@Deprecated(forRemoval = true)
@Deprecated
public List<Proxy> getProxies()
{
return proxies;

2
jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java
View File

@ -43,6 +43,8 @@ import org.eclipse.jetty.util.Fields;
* <p>You can create {@link Request} objects via {@link HttpClient#newRequest(String)} and
* you can send them using either {@link #send()} for a blocking semantic, or
* {@link #send(Response.CompleteListener)} for an asynchronous semantic.</p>
* <p>{@link Request} objects cannot be reused for other requests, not even for requests
* that have identical URI and headers.</p>
*
* @see Response
*/

2
jetty-deploy/src/main/config/modules/decorate.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Jetty setup to support Decoration of Listeners, Filters and Servlets within a deployed webapp.

2
jetty-deploy/src/main/config/modules/global-webapp-common.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables Deployer to apply common configuration to all webapp deployments.

2
jetty-deploy/src/test/resources/jetty.xml
View File

@ -3,7 +3,7 @@
<!-- =============================================================== -->
<!-- Documentation of this file format can be found at: -->
<!-- https://www.eclipse.org/jetty/documentation/current/ -->
<!-- https://eclipse.dev/jetty/documentation/ -->
<!-- -->
<!-- Additional configuration files are available in $JETTY_HOME/etc -->
<!-- and can be mixed in. See start.ini file for the default -->

4
jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the FastCGI implementation to the classpath.
@ -13,4 +13,4 @@ lib/fcgi/*.jar
[ini-template]
## For configuration of FastCGI contexts, see
## https://www.eclipse.org/jetty/documentation/current/fastcgi.html
## https://eclipse.dev/jetty/documentation/

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables GCloud Datastore API and implementation.

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Controls GCloud API classpath.

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables GCloudDatastore session management.

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session data store in an embedded Hazelcast Map.

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session data store in a remote Hazelcast Map.

2
jetty-home/src/main/resources/NOTICE.txt
View File

@ -2,7 +2,7 @@ Notices for Eclipse Jetty
=========================
This content is produced and maintained by the Eclipse Jetty project.
Project home: https://www.eclipse.org/jetty/
Project home: https://eclipse.dev/jetty/
Trademarks
----------

6
jetty-home/src/main/resources/README.adoc
View File

@ -1,6 +1,6 @@
=== ECLIPSE JETTY
The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a:
The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a:
* Java HTTP & WebSocket Server
* Servlet Container
@ -8,7 +8,7 @@ The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a:
Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub].
The Jetty documentation is available at link:https://www.eclipse.org/jetty/documentation[].
The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[].
// tag::quick[]
==== Quick Setup
@ -46,7 +46,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications
The Jetty server can be stopped with `ctrl+c` in the terminal window.
// end::quick[]
For more information about how to start Jetty, run this command (or go to the link:https://www.eclipse.org/jetty/documentation[documentation]):
For more information about how to start Jetty, run this command (or go to the link:https://eclipse.dev/jetty/documentation/[documentation]):
----
$ java -jar $JETTY_HOME/start.jar --help

2
jetty-home/src/main/resources/modules/demo-realm.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configure a demo authentication realm.

2
jetty-home/src/main/resources/modules/demo-root.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo root webapp.

10
jetty-home/src/main/resources/modules/demo.d/root/index.html
View File

@ -23,7 +23,7 @@
<a href="http://en.wikipedia.org/wiki/WebSocket">Websocket</a> and <a
href="http://en.wikipedia.org/wiki/HTTP/2">HTTP/2</a> protocols. The
project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Source</a> and hosted by the
<a href="http://www.eclipse.org">Eclipse Foundation</a> at <a href="https://www.eclipse.org/jetty/">https://www.eclipse.org/jetty/</a>.
<a href="http://www.eclipse.org">Eclipse Foundation</a> at <a href="https://eclipse.dev/jetty/">https://eclipse.dev/jetty/</a>.
</p>
</div>
@ -45,10 +45,10 @@
<td>
<h2>information</h2>
<ul>
<li><a href="https://www.eclipse.org/jetty/">Jetty Homepage</a></li>
<li><a href="https://www.eclipse.org/jetty/documentation/">Jetty Documentation Hub</a></li>
<li><a href="https://eclipse.dev/jetty/">Jetty Homepage</a></li>
<li><a href="https://eclipse.dev/jetty/documentation/">Jetty Documentation Hub</a></li>
<li><a href="/proxy/current/">Javadoc</a> (via transparent proxy)</li>
<li><a href="https://www.eclipse.org/jetty/powered">Jetty Powered</a></li>
<li><a href="https://eclipse.dev/jetty/powered">Jetty Powered</a></li>
<li>Optional content found only in<br><code>jetty-home-&lt;ver&gt;-with-docs.zip</code>
<ul>
<li><a href="/docs/">Jetty Documentation</a></li>
@ -60,7 +60,7 @@
<td>
<h2>getting&nbsp;help</h2>
<ul>
<li><a href="https://www.eclipse.org/jetty/mailinglists.php">Mailing lists @ eclipse</a></li>
<li><a href="https://accounts.eclipse.org/mailing-list/jetty-users">Mailing lists @ eclipse</a></li>
<li><a href="https://github.com/eclipse/jetty.project">Source @ github</a></li>
<li><a href="https://www.webtide.com/advice/">Developer Advice</a></li>
<li><a href="https://www.webtide.com/development">Custom Development</a></li>

2
jetty-home/src/main/resources/modules/demo.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
A meta module to enable all demo modules.

2
jetty-home/src/main/resources/modules/hawtio.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the Hawtio console as a web application.

2
jetty-home/src/main/resources/modules/jamon.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the JAMon web application.

2
jetty-home/src/main/resources/modules/jolokia.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the Jolokia console as a web application.

2
jetty-home/src/main/resources/modules/jsp.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JSP for all web applications deployed on the server.

2
jetty-home/src/main/resources/modules/jstl.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JSTL for all web applications deployed on the server.

2
jetty-home/src/main/resources/modules/logging-jcl-capture.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures jakarta-commons-logging events and bridges them to SLF4J.

2
jetty-home/src/main/resources/modules/logging-jetty.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Base configuration for the jetty logging mechanism.

2
jetty-home/src/main/resources/modules/logging-jul-capture.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures java.util.logging events and bridges them to slf4j.

2
jetty-home/src/main/resources/modules/logging-jul.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures jetty logging to use Java Util Logging (jul).

2
jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures Apache log4j events and bridges them to SLF4J.

2
jetty-home/src/main/resources/modules/logging-log4j1.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use Log4j.

2
jetty-home/src/main/resources/modules/logging-log4j2.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use log4j version 2.

2
jetty-home/src/main/resources/modules/logging-logback.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use Logback Logging.

2
jetty-home/src/main/resources/modules/logging-noop.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use SLF4J No-Op Implementation.

2
jetty-home/src/main/resources/modules/logging/slf4j.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures logging to use SLF4J.

2
jetty-home/src/main/resources/modules/setuid.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the UNIX setUID configuration.

2
jetty-home/src/main/resources/modules/stop.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
This module causes Jetty to stop immediately after starting.

21
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/parser/HeaderParser.java
View File

@ -15,6 +15,7 @@ package org.eclipse.jetty.http2.parser;
import java.nio.ByteBuffer;
import org.eclipse.jetty.http2.Flags;
import org.eclipse.jetty.http2.frames.Frame;
import org.eclipse.jetty.http2.frames.FrameType;
@ -140,11 +141,31 @@ public class HeaderParser
return type;
}
/**
* <p>Returns whether the given header {@link Flags flag} is present.</p>
*
* @param bit the flag to test for presence
* @return whether the flag is present
*/
public boolean hasFlag(int bit)
{
return (flags & bit) == bit;
}
/**
* <p>Returns the raw value of the header flag bits.</p>
* <p>Use {@link #hasFlag(int)} to test for flag presence.
* This method should be used just to retrieve the raw value
* of all the flag bits.</p>
*
* @return the raw value of the headers flag bits
* @see #hasFlag(int)
*/
public int getFlags()
{
return flags;
}
public int getStreamId()
{
return streamId;

2
jetty-jaas/src/main/config/modules/jaas.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JAAS for deployed web applications.

2
jetty-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Provides a DefaultAuthConfigFactory for jaspi

2
jetty-jaspi/src/main/config/modules/jaspi-demo.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JASPI basic authentication the /test context path.

2
jetty-jaspi/src/main/config/modules/jaspi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JASPI authentication for deployed web applications.

2
jetty-jndi/src/main/config/modules/jndi.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the Jetty JNDI implementation to the classpath.

5
jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
View File

@ -59,9 +59,8 @@ import org.eclipse.jetty.util.resource.Resource;
* Note that the same java compiler will be used as for on-the-fly compiled
* jsps, which will be the Eclipse java compiler.
* <p>
* See <a
* href="https://www.eclipse.org/jetty/documentation/current/jetty-jspc-maven-plugin.html">Usage
* Guide</a> for instructions on using this plugin.
* See <a href="https://eclipse.dev/jetty/documentation/">Usage Guide</a> for
* instructions on using this plugin.
* </p>
* Runs jspc compiler to produce .java and .class files
*/

4
jetty-jspc-maven-plugin/src/site/site.xml
View File

@ -6,8 +6,8 @@
<bannerLeft>
<name>${project.name}</name>
<src>https://www.eclipse.org/jetty/images/jetty-logo-80x22.png</src>
<href>https://eclipse.org/jetty/</href>
<src>https://eclipse.dev/jetty/images/jetty-logo-80x22.png</src>
<href>https://eclipse.dev/jetty/</href>
</bannerLeft>
<bannerRight>
<src>https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png</src>

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables test setup

2
jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables test setup

2
jetty-maven-plugin/src/main/resources/maven.mod
View File

@ -1,4 +1,4 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables an un-assembled Maven webapp to run in a Jetty distribution.

4
jetty-maven-plugin/src/site/site.xml
View File

@ -6,8 +6,8 @@
<bannerLeft>
<name>${project.name}</name>
<src>https://www.eclipse.org/jetty/images/jetty-logo-80x22.png</src>
<href>https://eclipse.org/jetty/</href>
<src>https://eclipse.dev/jetty/images/jetty-logo-80x22.png</src>
<href>https://eclipse.dev/jetty/</href>
</bannerLeft>
<bannerRight>
<src>https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png</src>

Some files were not shown because too many files have changed in this diff Show More