Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty · Mar 16, 2017 · 08f351b · 08f351b
2 parents 398e5b3 + f775187
commit 08f351b
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 5 deletions.
diff --git a/jetty-distribution/src/main/assembly/jetty-assembly.xml b/jetty-distribution/src/main/assembly/jetty-assembly.xml
@@ -14,6 +14,36 @@
       <excludes>
         <exclude>**/META-INF/**</exclude>
         <exclude>*-config.jar</exclude>
+        <!-- common OS detritus -->
+        <exclude>**/.DS_Store</exclude>
+        <exclude>**/Thumbs.db</exclude>
+        <exclude>**/desktop.ini</exclude>
+        <!-- common temp files -->
+        <exclude>**/*~</exclude>
+        <exclude>**/*.bak</exclude>
+        <exclude>**/*.backup</exclude>
+        <exclude>**/*.old</exclude>
+        <exclude>**/*.swp</exclude>
+        <exclude>**/*.debug</exclude>
+        <exclude>**/*.dump</exclude>
+        <exclude>**/*.log</exclude>
+        <exclude>**/~*</exclude>
+        <!-- common git/scm files -->
+        <exclude>**/*.orig</exclude>
+        <exclude>**/*.diff</exclude>
+        <exclude>**/*.patch</exclude>
+        <exclude>**/.gitignore</exclude>
+        <!-- various editor files -->
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+        <exclude>**/*.idea</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings</exclude>
+        <!-- maven dust -->
+        <exclude>**/*.versionsBackup</exclude>
+        <exclude>**/*.releaseBackup</exclude>
       </excludes>
     </fileSet>
   </fileSets>

diff --git a/jetty-distribution/src/main/assembly/jetty-src.xml b/jetty-distribution/src/main/assembly/jetty-src.xml
@@ -12,6 +12,36 @@
       </includes>
       <excludes>
         <exclude>**/target/**</exclude>
+        <!-- common OS detritus -->
+        <exclude>**/.DS_Store</exclude>
+        <exclude>**/Thumbs.db</exclude>
+        <exclude>**/desktop.ini</exclude>
+        <!-- common temp files -->
+        <exclude>**/*~</exclude>
+        <exclude>**/*.bak</exclude>
+        <exclude>**/*.backup</exclude>
+        <exclude>**/*.old</exclude>
+        <exclude>**/*.swp</exclude>
+        <exclude>**/*.debug</exclude>
+        <exclude>**/*.dump</exclude>
+        <exclude>**/*.log</exclude>
+        <exclude>**/~*</exclude>
+        <!-- common git/scm files -->
+        <exclude>**/*.orig</exclude>
+        <exclude>**/*.diff</exclude>
+        <exclude>**/*.patch</exclude>
+        <exclude>**/.gitignore</exclude>
+        <!-- various editor files -->
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+        <exclude>**/*.idea</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings</exclude>
+        <!-- maven dust -->
+        <exclude>**/*.versionsBackup</exclude>
+        <exclude>**/*.releaseBackup</exclude>
       </excludes>
     </fileSet>
   </fileSets>

diff --git a/...ntation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc b/...ntation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
@@ -51,7 +51,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.

diff --git a/...c/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc b/...c/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
@@ -81,7 +81,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by mybase only.
 .  The `start.jar --add-to-start=logging,webapp-logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  Several entries are added to the `${jetty.base}/start.ini` configuration.

diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
@@ -47,7 +47,7 @@ DOWNLOAD: https://raw.githubusercontent.com/jetty-project/logging-modules/master
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.

diff --git a/...on/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc b/...on/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
@@ -70,7 +70,7 @@ Logging API::
 Slf4j Binding JAR::
   * Special JARs, created and maintained by the Slf4j project, that pretend to be the various Logging API implementation classes, but instead just route that Logging API's events to Slf4j to handle.
   * There MAY be multiple Slf4j binding JARs present on the classpath at the same time.
-  
+
   * For a single logging API, if you choose to use the Slf4j binding JAR, then you MUST NOT include the SLf4j adapter JAR or underlying logging  framework in the classpath as well.
 Slf4j Adapter Jar::
   * These JARs are created and maintained by the Slf4j project and route Slf4j logging events to a specific underlying logging framework.
@@ -118,7 +118,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.