Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
This commit is contained in:
Joakim Erdfelt
commit
88f3dd5a52
|
|
@ -6,7 +6,7 @@
|
|||
<link rel="stylesheet" type="text/css" href="stylesheet.css"/>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<A HREF="https://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<br/>
|
||||
<b><a href="http://localhost:8080/">Demo Home</a></b>
|
||||
<hr/>
|
||||
|
|
@ -32,11 +32,13 @@ href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/te
|
|||
</P>
|
||||
<big><b><A HREF="auth.html">LOGIN</A></b></big>
|
||||
<p>
|
||||
This demo uses a simple login module that stores its configuration in a properties file. There are other types of login module provided with the jetty distro. For full information, please refer to the <a href="http://www.eclipse.org/jetty/documentation/current/">Jetty documentation</a>.
|
||||
This demo uses a simple login module that stores its configuration in a properties file. There are other types of login
|
||||
module provided with the jetty distro. For full information, please refer to the
|
||||
<a href="https://www.eclipse.org/jetty/documentation/current/">Jetty 9 documentation</a>.
|
||||
</p>
|
||||
|
||||
<hr/>
|
||||
<center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a></center>
|
||||
<center><a href="https://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a></center>
|
||||
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>demo-jetty-webapp</artifactId>
|
||||
<name>Demo :: Jetty Test Webapp</name>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
<packaging>war</packaging>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
</style>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="jetty_banner.gif"></A>
|
||||
<A HREF="https://www.eclipse.org/jetty"><IMG SRC="jetty_banner.gif"></A>
|
||||
<br/>
|
||||
<b><a href="http://localhost:8080/">Demo Home</a></b>
|
||||
<hr/>
|
||||
|
|
@ -56,17 +56,17 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base.
|
|||
</td></tr></table>
|
||||
|
||||
<h2>Useful links:</h2>
|
||||
<ul>
|
||||
<li><a
|
||||
href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jetty-webapp">Source
|
||||
tree of this webapp</a></li>
|
||||
<li><a href="http://www.eclipse.org/jetty">Jetty project home</a></li>
|
||||
<li><a href="http://www.eclipse.org/jetty/documentation/current/">Documentation</a></li>
|
||||
<li><a href="http://www.webtide.com">Commercial Support</a></li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li><a
|
||||
href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jetty-webapp">Source
|
||||
tree of this webapp</a></li>
|
||||
<li><a href="https://www.eclipse.org/jetty">Jetty project home</a></li>
|
||||
<li><a href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a></li>
|
||||
<li><a href="http://www.webtide.com">Commercial Support</a></li>
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
<hr/>
|
||||
<center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
|
||||
<center><a href="https://www.eclipse.org/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
<META http-equiv="Cache-Control" content="no-cache,no-store">
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="jetty_banner.gif"></A>
|
||||
<h1>Welcome to Jetty - REMOTE ACCESS!!</h1>
|
||||
<A HREF="https://www.eclipse.org/jetty/"><IMG SRC="jetty_banner.gif"></A>
|
||||
<h1>Welcome to Jetty 10 - REMOTE ACCESS!!</h1>
|
||||
<p>
|
||||
This is the Test webapp for the Jetty HTTP Server and Servlet Container.
|
||||
For more information about Jetty, please visit our
|
||||
<a href="http://www.eclipse.org/jetty">website</a>
|
||||
or <a href="http://www.eclipse.org/jetty/documentation/current/">documentation</a>.
|
||||
Commercial support for Jetty is available via <a href="http://www.webtide.com">webtide</a>.
|
||||
For more information about Jetty, please visit our
|
||||
<a href="https://www.eclipse.org/jetty/">website</a>
|
||||
or <a href="https://www.eclipse.org/jetty/documentation/current/">documentation</a>.
|
||||
Commercial support for Jetty is available via <a href="http://www.webtide.com">webtide</a>.
|
||||
</p>
|
||||
<p>
|
||||
This test context serves several demo filters and servlets
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<link rel="stylesheet" type="text/css" href="stylesheet.css"/>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<A HREF="https://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<br/>
|
||||
<b><a href="http://localhost:8080/">Demo Home</a></b>
|
||||
<hr/>
|
||||
|
|
@ -41,7 +41,7 @@ Click <code>Test</code> to check the runtime lookup of the JNDI resources.
|
|||
|
||||
|
||||
<hr/>
|
||||
<center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a> </center>
|
||||
<center><a href="https://www.eclipse.org/jetty/"><img style="border:0" src="images/small_powered_by.gif"/></a></center>
|
||||
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<link rel="stylesheet" type="text/css" href="stylesheet.css"/>
|
||||
</HEAD>
|
||||
<BODY >
|
||||
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<A HREF="https://www.eclipse.org/jetty/"><IMG SRC="images/jetty_banner.gif"></A>
|
||||
<br/>
|
||||
<b><a href="http://localhost:8080/">Demo Home</a></b>
|
||||
<hr/>
|
||||
|
|
@ -76,7 +76,7 @@ Test of the annotation:
|
|||
|
||||
<div style="text-align: center;">
|
||||
<hr/>
|
||||
<a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a>
|
||||
<a href="https://www.eclipse.org/jetty/"><img style="border:0" src="images/small_powered_by.gif"/></a>
|
||||
</div>
|
||||
|
||||
</BODY>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
<artifactId>demos-jetty-embedded</artifactId>
|
||||
<name>Demos :: Jetty Embedded</name>
|
||||
<description>Jetty Embedded Demos</description>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
<artifactId>jetty-annotations</artifactId>
|
||||
<name>Jetty :: Servlet Annotations</name>
|
||||
<description>Annotation support for deploying servlets in jetty.</description>
|
||||
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<artifactId>jetty-bom</artifactId>
|
||||
<name>Jetty :: Bom</name>
|
||||
<description>Jetty BOM artifact</description>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
<url>https://eclipse.org/jetty</url>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-cdi</artifactId>
|
||||
<name>Jetty :: CDI</name>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.cdi</bundle-symbolic-name>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>jetty-client</artifactId>
|
||||
<name>Jetty :: Asynchronous HTTP Client</name>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
|
||||
<jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
|
||||
|
|
|
|||
|
|
@ -127,6 +127,18 @@
|
|||
</attributes>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>index</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>process-asciidoc</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sourceDirectory>src/main/asciidoc</sourceDirectory>
|
||||
<sourceDocumentName>index.adoc</sourceDocumentName>
|
||||
<outputDirectory>${project.build.directory}/html</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>operations-guide</id>
|
||||
<phase>generate-resources</phase>
|
||||
|
|
@ -163,6 +175,18 @@
|
|||
<outputDirectory>${project.build.directory}/html/programming-guide</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>old_docs</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>process-asciidoc</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sourceDirectory>${basedir}/src/main/asciidoc/old_docs</sourceDirectory>
|
||||
<sourceDocumentName>index.adoc</sourceDocumentName>
|
||||
<outputDirectory>${project.build.directory}/html/old_docs</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,3 @@ ifdef::backend-html5[]
|
|||
:safe-mode-unsafe:
|
||||
:linkcss:
|
||||
endif::[]
|
||||
|
||||
// TODO: remove this attribute once all documentation has been ported.
|
||||
:sub-order: attributes+
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
//
|
||||
// ========================================================================
|
||||
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
|
||||
//
|
||||
// This program and the accompanying materials are made available under
|
||||
// the terms of the Eclipse Public License 2.0 which is available at
|
||||
// https://www.eclipse.org/legal/epl-2.0
|
||||
//
|
||||
// This Source Code may also be made available under the following
|
||||
// Secondary Licenses when the conditions for such availability set
|
||||
// forth in the Eclipse Public License, v. 2.0 are satisfied:
|
||||
// the Apache License v2.0 which is available at
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
|
||||
// ========================================================================
|
||||
//
|
||||
|
||||
:doctitle: Eclipse Jetty Documentation
|
||||
|
||||
include::config.adoc[]
|
||||
|
||||
== xref:operations-guide/index.adoc[Jetty Operations Guide]
|
||||
|
||||
The Eclipse Jetty Operations Guide targets sysops, devops, and developers who want to install Eclipse Jetty as a standalone server to deploy web applications.
|
||||
|
||||
== xref:programming-guide/index.adoc[Jetty Programming Guide]
|
||||
|
||||
The Eclipse Jetty Programming Guide targets developers who want to use the Eclipse Jetty libraries in their applications, and advanced sysops/devops that want to customize the deployment of web applications.
|
||||
|
||||
== xref:contribution-guide/index.adoc[Jetty Contribution Guide]
|
||||
|
||||
The Eclipse Jetty Programming Guide targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements.
|
||||
|
||||
== xref:old_docs/index.adoc[OLD Jetty Documentation]
|
||||
|
||||
The guides above are a work in progress for the current Jetty version.
|
||||
|
||||
The old Jetty documentation refers to old Jetty versions, and it is currently being ported to the current Jetty version.
|
||||
|
|
@ -30,16 +30,16 @@ We have a number of options for people that wish to subscribe to our mailing lis
|
|||
|
||||
* Jetty Developers List
|
||||
** Join - https://dev.eclipse.org/mailman/listinfo/jetty-dev
|
||||
** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-dev/
|
||||
** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-dev/
|
||||
* Jetty Users List
|
||||
** Join - https://dev.eclipse.org/mailman/listinfo/jetty-users
|
||||
** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-users/
|
||||
** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-users/
|
||||
* Jetty Announcements List
|
||||
** Join - https://dev.eclipse.org/mailman/listinfo/jetty-announce
|
||||
** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-announce/
|
||||
** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-announce/
|
||||
* Jetty Commit List
|
||||
** Join - https://dev.eclipse.org/mailman/listinfo/jetty-commit
|
||||
** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-commit/
|
||||
** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-commit/
|
||||
|
||||
[[community-irc]]
|
||||
==== Internet Relay Chat - IRC
|
||||
|
|
@ -48,5 +48,5 @@ Much of our conversations about Jetty occur on IRC in one location or another.
|
|||
Users are always welcome to come join our IRC channels and talk with us, other users, or just lurk.
|
||||
|
||||
irc.freenode.org - #jetty::
|
||||
Our primary location, we recommend that if your looking to find folks on IRC you try here.
|
||||
We also have commit notifications coming to this channel on the bottom and top of the hour.
|
||||
Our primary location, we recommend that if your looking to find folks on IRC you try here.
|
||||
We also have commit notifications coming to this channel on the bottom and top of the hour.
|
||||
|
|
@ -230,28 +230,28 @@ These files will then be visible from http://download.eclipse.org/jetty/updates/
|
|||
[[releasing-documentation]]
|
||||
==== Release Documentation
|
||||
|
||||
There are two git repositories you need to be aware of for releasing jetty-documentation. The jetty-documentation is located in our github repository and the jetty-website is located at eclipse.
|
||||
There are two git repositories you need to be aware of for releasing jetty-documentation.The jetty-documentation is located in our github repository and the jetty-website is located at eclipse.
|
||||
|
||||
jetty-documentation::
|
||||
https://github.com/jetty-project/jetty-documentation
|
||||
https://github.com/jetty-project/jetty-documentation
|
||||
jetty-website::
|
||||
http://git.eclipse.org/c/www.eclipse.org/jetty.git
|
||||
http://git.eclipse.org/c/www.eclipse.org/jetty.git
|
||||
|
||||
Do the following steps to publish documentation for the release:
|
||||
|
||||
1. Checkout the jetty-documentation repository.
|
||||
2. Edit the <version> of the jetty-documentation pom.xml and change it _locally_ to be the release number, eg 9.2.6.v20141205
|
||||
3. Build the documentation with mvn clean install
|
||||
4. Checkout the jetty-website
|
||||
5. Inside the documentation/ directory, make a directory named the same as the release number, eg 9.2.6.v20141205/
|
||||
6. Copy the built `documentation` from jetty-documentation/target/docbkx/html/jetty into the new directory
|
||||
7. Edit the `index.html` file in the `documentation` directory and add the newly released documentation url.
|
||||
1. Checkout the jetty-documentation repository.
|
||||
2. Edit the <version> of the jetty-documentation pom.xml and change it _locally_ to be the release number, eg 9.2.6.v20141205
|
||||
3. Build the documentation with mvn clean install
|
||||
4. Checkout the jetty-website
|
||||
5. Inside the documentation/ directory, make a directory named the same as the release number, eg 9.2.6.v20141205/
|
||||
6. Copy the built `documentation` from jetty-documentation/target/docbkx/html/jetty into the new directory
|
||||
7. Edit the `index.html` file in the `documentation` directory and add the newly released documentation url.
|
||||
Make sure you follow the other examples and include the `rel="nofollow"` attribute on the link so that search engines do not crawl newly created documentation, otherwise we are subject to duplicate content penalties in SEO.
|
||||
8. Commit the changes to the jetty-website project
|
||||
8. Commit the changes to the jetty-website project
|
||||
|
||||
____
|
||||
[NOTE]
|
||||
There is a separate Jenkins build job that publishes documentation to http://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://www.eclipse.org/jetty/documentation/current 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.
|
||||
____
|
||||
|
|
@ -25,11 +25,11 @@ Jetty has no GUI (Graphical User Interface), so running the server and performin
|
|||
Once you have access to your system's command line, navigate to the directory where you unpacked your copy of the Jetty distribution.
|
||||
To start Jetty on the default port of 8080, run the following command:
|
||||
|
||||
[source, screen, subs="{sub-order}"]
|
||||
[source,screen,subs="{sub-order}"]
|
||||
----
|
||||
$ 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 http://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://www.eclipse.org/jetty/documentation/current/startup.html
|
||||
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}
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue