fix some merge issues, some example javadoc that was never right and contributing language
This commit is contained in:
Jesse McConnell
commit
d8f74233a0
|
|
@ -20,7 +20,9 @@ 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)
|
||||
|
||||
The canonical Jetty git repository is located at GitHub. Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper.
|
||||
The canonical Jetty git repository is located at GitHub. Providing you have
|
||||
completed the contributors agreement mentioned below we will endeavor to pull
|
||||
your commit into Jetty proper.
|
||||
|
||||
Contributor License Agreement
|
||||
------------------------------
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
<url>http://eclipse.org/jetty</url>
|
||||
<Built-By>${user.name}</Built-By>
|
||||
<package>org.eclipse.jetty</package>
|
||||
<Bundle-License>https://github.com/eclipse/jetty.project/blob/master/NOTICE.txt</Bundle-License>
|
||||
<Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>
|
||||
<Bundle-Name>Jetty</Bundle-Name>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<url>http://eclipse.org/jetty</url>
|
||||
<Built-By>${user.name}</Built-By>
|
||||
<package>org.eclipse.jetty</package>
|
||||
<Bundle-License>https://github.com/eclipse/jetty.project/blob/master/NOTICE.txt</Bundle-License>
|
||||
<Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>
|
||||
<Bundle-Name>Jetty</Bundle-Name>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@ import org.eclipse.jetty.xml.XmlConfiguration;
|
|||
/**
|
||||
* Configures and Starts a Jetty server from an XML declaration.
|
||||
* <p>
|
||||
* See <a href=
|
||||
* "https://github.com/eclipse/jetty.project/blob/master/examples/embedded/src/main/resources/exampleserver.xml"
|
||||
* >exampleserver.xml</a>
|
||||
* See <a href="https://raw.githubusercontent.com/eclipse/jetty.project/master/examples/embedded/src/main/resources/exampleserver.xml">exampleserver.xml</a>
|
||||
* </p>
|
||||
*/
|
||||
public class ExampleServerXml
|
||||
|
|
|
|||
|
|
@ -29,9 +29,7 @@ import org.eclipse.jetty.xml.XmlConfiguration;
|
|||
* via an {@link XmlConfiguration} config file that does the identical work.
|
||||
* </p>
|
||||
* <p>
|
||||
* See <a href=
|
||||
* "http://https://github.com/eclipse/jetty.project/blob/master/examples/embedded/src/main/resources/fileserver.xml"
|
||||
* >fileserver.xml</a>
|
||||
* See <a href="https://raw.githubusercontent.com/eclipse/jetty.project/master/examples/embedded/src/main/resources/fileserver.xml">fileserver.xml</a>
|
||||
* </p>
|
||||
*/
|
||||
public class FileServerXml
|
||||
|
|
|
|||
|
|
@ -90,4 +90,3 @@ https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/
|
|||
|
||||
## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
|
||||
## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
|
||||
|
||||
|
|
|
|||
|
|
@ -80,4 +80,3 @@ jetty.ssl.port=8443
|
|||
|
||||
## Whether cipher order is significant (since java 8 only)
|
||||
# jetty.sslContext.useCipherSuitesOrder=true
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
jetty.version=9.3
|
||||
jetty.version=9.3
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<h1>Welcome to Jetty 9</h1>
|
||||
<p>
|
||||
This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container.
|
||||
This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container.
|
||||
It is configured as a jetty base directory in $JETTY_HOME/demo_base.
|
||||
</p>
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base.
|
|||
<li><a href="session/">Session</a></li>
|
||||
<li><a href="cookie/">Cookie</a></li>
|
||||
</ul></li>
|
||||
<li>Comet Chat Examples:
|
||||
<li>Comet Chat Examples:
|
||||
<ul>
|
||||
<li><a href="chat/">Long Polling</a></li>
|
||||
<li><a href="ws">WebSocket (Jetty API)</a></li>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<h1>JNDI Test WebApp</h1>
|
||||
|
||||
<p>
|
||||
This example shows how to configure and lookup resources such as DataSources, a JTA transaction manager and a java.mail.Session in JNDI.
|
||||
This example shows how to configure and lookup resources such as DataSources, a JTA transaction manager and a java.mail.Session in JNDI.
|
||||
</p>
|
||||
|
||||
<h2>Preparation</h2>
|
||||
|
|
@ -27,7 +27,7 @@ This example shows how to configure and lookup resources such as DataSources, a
|
|||
</p>
|
||||
<p>This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --add-to-start option instead, then the same initialisation will be appended to the
|
||||
$JETTY_BASE/start.ini file instead. The jetty demo-base already has JNDI enabled in the start.ini file and some mock resources included. </p>
|
||||
<p>The full source of this demonstration is available <a href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jndi-webapp">here</a>.</p>
|
||||
<p>The full source of this demonstration is available <a href="https://github.com/eclipse/jetty.project/blob/master/tree/tests/test-webapps/test-jndi-webapp">here</a>.</p>
|
||||
|
||||
|
||||
<h2>Execution</h2>
|
||||
|
|
|
|||
Loading…
Reference in New Issue