This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 27943dd fixed misc syntax color issues
27943dd is described below
commit 27943ddfa05b582299f3255d3569e8535ca18273
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Jun 6 08:49:25 2020 +0200
fixed misc syntax color issues
---
.../apt/examples/adding-filtering-webresources.apt.vm | 4 ++--
src/site/apt/examples/rapid-testing-jetty6-plugin.apt | 4 ++--
src/site/apt/examples/skinny-wars.apt.vm | 4 ++++
src/site/apt/overlays.apt.vm | 17 +++++++++++++++++
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/site/apt/examples/adding-filtering-webresources.apt.vm
b/src/site/apt/examples/adding-filtering-webresources.apt.vm
index 91c30ca..56f97ba 100644
--- a/src/site/apt/examples/adding-filtering-webresources.apt.vm
+++ b/src/site/apt/examples/adding-filtering-webresources.apt.vm
@@ -91,7 +91,7 @@ Adding and Filtering External Web Resources
would end up in the WAR as:
-+----------+
+----------
documentedproject-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
@@ -115,7 +115,7 @@ documentedproject-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
<<<external-resource2.jpg>>> and <<<image2>>> are copied to the root of the
WAR, preserving the
directory structure.
diff --git a/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
b/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
index a3fecc8..a500a93 100644
--- a/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
+++ b/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
@@ -66,9 +66,9 @@ Rapid Testing Using the Jetty Plugin
Then start Jetty:
-+-----------------+
+-----------------
mvn jetty:run
-+-----------------+
+-----------------
The command will block with Jetty listening on port 8080.
diff --git a/src/site/apt/examples/skinny-wars.apt.vm
b/src/site/apt/examples/skinny-wars.apt.vm
index 89585de..f530dbd 100644
--- a/src/site/apt/examples/skinny-wars.apt.vm
+++ b/src/site/apt/examples/skinny-wars.apt.vm
@@ -45,6 +45,7 @@ Creating Skinny WARs
be packaged in the root of the EAR) and Java libraries (which are packaged in
<<<lib/>>>).
+-----------------+
+<project>
...
<build>
<plugins>
@@ -59,6 +60,7 @@ Creating Skinny WARs
</plugins>
</build>
...
+</project>
+-----------------+
Now the painful part. Your EAR project's <<<pom.xml>>> needs to list every
dependency that the WAR has.
@@ -66,6 +68,7 @@ Creating Skinny WARs
of WARs within the EAR.
+-----------------+
+<project>
....
<dependencies>
<dependency>
@@ -87,6 +90,7 @@ Creating Skinny WARs
</dependency>
</dependencies>
...
+</project>
+-----------------+
Your EAR will contain something like this:
diff --git a/src/site/apt/overlays.apt.vm b/src/site/apt/overlays.apt.vm
index f5e3651..741a80e 100644
--- a/src/site/apt/overlays.apt.vm
+++ b/src/site/apt/overlays.apt.vm
@@ -63,6 +63,7 @@ Overlays
which is declared as a dependency in the project's <<<pom.xml>>>:
+-----------------+
+<project>
...
<dependencies>
<dependency>
@@ -75,6 +76,7 @@ Overlays
...
</dependencies>
...
+</project>
+-----------------+
The structure for the <<<documentedprojectdependency>>> WAR file looks like
this:
@@ -176,6 +178,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
<<<documentedprojectdependency>>> <<<war>>> overlay above:
+-----------------+
+<project>
...
<build>
<plugins>
@@ -198,6 +201,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugins>
</build>
...
+</project>
+-----------------+
@@ -221,6 +225,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
+-----------------+
+<project>
...
<build>
<plugins>
@@ -243,6 +248,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugins>
</build>
...
+</project>
+-----------------+
<<Note:>> In the scenario above, any other WAR dependency will be applied
after the current build
@@ -254,6 +260,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
regular way, define two overlay configurations for <<<my-webapp>>>:
+-----------------+
+<project>
...
<build>
<plugins>
@@ -288,6 +295,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugins>
</build>
...
+</project>
+-----------------+
@@ -299,6 +307,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
has no specific <<<includes>>> element will inherit this setting by
default.
+-----------------+
+<project>
...
<plugins>
<plugin>
@@ -311,12 +320,14 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugin>
</plugins>
...
+</project>
+-----------------+
* <<dependentWarExcludes>> - sets the default excludes to apply to all
overlays. Any overlay that
has no specific <<<excludes>>> element will inherit this setting by
default.
+-----------------+
+<project>
...
<plugins>
<plugin>
@@ -329,11 +340,13 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugin>
</plugins>
...
+</project>
+-----------------+
* <<workDirectory>> - sets the directory where overlays will be temporarily
extracted.
+-----------------+
+<project>
...
<plugins>
<plugin>
@@ -347,6 +360,8 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugin>
</plugins>
...
+</project>
++-----------------+
* Zip dependencies with overlays
@@ -354,6 +369,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
instance to inject the content of a zip overlay in the <<<scripts>>>
directory of the webapp, do as follows:
+-----------------+
+<project>
...
<plugins>
<plugin>
@@ -373,4 +389,5 @@ documentedprojectdependency-1.0-SNAPSHOT.war
</plugin>
</plugins>
...
+</project>
+-----------------+
