diff --git a/jetty-documentation/src/main/asciidoc/old_docs/embedding/embedding-jetty.adoc b/jetty-documentation/src/main/asciidoc/old_docs/embedding/embedding-jetty.adoc index 469e119dc66..651f06a294e 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/embedding/embedding-jetty.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/embedding/embedding-jetty.adoc @@ -239,7 +239,7 @@ The link:{GITBROWSEURL}/examples/embedded/src/main/java/org/eclipse/jetty/embedd * link:{GITBROWSEURL}/jetty-server/src/main/config/etc/jetty-stats.xml[jetty-stats.xml] * link:{GITBROWSEURL}/jetty-server/src/main/config/etc/jetty-requestlog.xml[jetty-requestlog.xml] * link:{GITBROWSEURL}/jetty-server/src/main/config/etc/jetty-lowresources.xml[jetty-lowresources.xml] -* link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml[test-realm.xml] +* link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml[test-realm.xml] [source, java, subs="{sub-order}"] ---- diff --git a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc index 06c07c405de..7446c0ff68a 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc @@ -1157,6 +1157,6 @@ In addition, as the feature group includes websocket, you will need to download |======================================================================= |Jar |Bundle Symbolic Name |Location |javax.websocket-api |javax.websocket-api -|https://repo1.maven.org/maven2/javax/websocket/websocket-api[Maven +|https://repo1.maven.org/maven2/javax/websocket/[Maven central] |======================================================================= diff --git a/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/introduction/jetty-javaee.adoc b/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/introduction/jetty-javaee.adoc index 08191b22a5e..ed1500e14da 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/introduction/jetty-javaee.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/introduction/jetty-javaee.adoc @@ -19,7 +19,7 @@ [[jetty-javaee]] === Jetty and Java EE Web Profile -Jetty implements aspects of the Java EE specification, primarily the Servlet Specification. +Jetty implements aspects of the Java EE specification, primarily the Servlet Specification. Recent releases of the Java EE platform have introduced a Web Profile, recognizing that many developers need only a subset of the many technologies under the Java EE umbrella. While Jetty itself does not ship all of the Web Profile technologies, Jetty architecture is such that you can plug in third party implementations to produce a container customized to your exact needs. @@ -67,7 +67,7 @@ Validator] |http://jcp.org/en/jsr/detail?id=353[JSR 353] |Java API for JSON Processing 1.0 (JSON-P) |No |Yes, eg JSON-P https://java.net/projects/jsonp/[reference implementation] -|link:jcp.org/en/jsr/detail?id=318[JSR 318] |Interceptors 1.2 |No |Yes as part of a CDI implementation +|http://jcp.org/en/jsr/detail?id=318[JSR 318] |Interceptors 1.2 |No |Yes as part of a CDI implementation |======================================================================= [[jetty-javaee-6]] @@ -102,7 +102,7 @@ Here is the matrix of JSRs for Java EE 6 Web Profile, and how they relate to Jet |http://jcp.org/en/jsr/detail?id=250[JSR 250] |Common Annotations for the Java Platform |Yes |Partially (for non-core Servlet Spec annotations) -|http://jcp.org/en/jsr/detail?id=907[JSR 907] |Java Transaction API (JTA) |Yes |Implementations are pluggable, such as http://www.atomikos.com/[Atomikos], http://jotm.ow2.org/xwiki/bin/view/Main/WebHome[JOTM], http://jencks.codehaus.org/Transaction+Manager[Jencks (Geronimo Transaction Manager)] +|http://jcp.org/en/jsr/detail?id=907[JSR 907] |Java Transaction API (JTA) |Yes |Implementations are pluggable, such as http://www.atomikos.com/[Atomikos], http://jotm.ow2.org/[JOTM], http://jencks.codehaus.org/Transaction+Manager[Jencks (Geronimo Transaction Manager)] |http://jcp.org/en/jsr/detail?id=303[JSR 303] |Bean Validation 1.0 |No |Yes as part of another technology (JSF), or a stand-alone implementation such as http://www.hibernate.org/subprojects/validator/docs.html[Hiberate Validator] diff --git a/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/webdefault-xml.adoc b/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/webdefault-xml.adoc index 84aead936cb..a99526ac09c 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/webdefault-xml.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/webdefault-xml.adoc @@ -33,12 +33,12 @@ The `webdefault.xml` file is located in `$(jetty.home)/etc/webdefault.xml`. You can specify a custom configuration file to use for specific webapps, or for all webapps. If you do not specify an alternate defaults descriptor, the `$JETTY-HOME/etc/jetty-deploy.xml` file will configure jetty to automatically use `$JETTY_HOME/etc/webdefault.xml`. -____ [NOTE] +==== To ensure your `webdefault.xml` files are validated, you will need to set the `validateXml` attribute to true as described link:#jetty-xml-dtd[here.] -____ +==== -The `webdefault.xml` link:{GITBROWSURL}/jetty-webapp/src/main/config/etc/webdefault.xml[included with the Jetty Distribution] contains several configuration options, such as init params and servlet mappings, and is separated into sections for easy navigation. +The `webdefault.xml` link:{GITBROWSEURLSURL}/jetty-webapp/src/main/config/etc/webdefault.xml[included with the Jetty Distribution] contains several configuration options, such as init params and servlet mappings, and is separated into sections for easy navigation. Some of the more common options include, but are not limited to: dirAllowed:: diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc index 9388e127854..6767c6d973d 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc @@ -204,7 +204,7 @@ $ java -jar start.jar --module=websocket --write-module-graph=modules.dot $ dot -Tpng -o modules.png modules.dot ---- + -See http://graphviz.org/[graphviz.org] for details on http://graphviz.org/content/command-line-invocation[how to post-process this dotty file] into the output best suited for your needs. +See http://graphviz.org/[graphviz.org] for details on how to post-process this dotty file into the output best suited for your needs. --create-files:: Create any missing files that are required by initialized modules.