You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/06/06 06:41:29 UTC
[maven-war-plugin] branch master updated: avoid syntax color when
not useful
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 3ad95e1 avoid syntax color when not useful
3ad95e1 is described below
commit 3ad95e1316aee227f5e2cc960134e5b30f358001
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Jun 6 08:41:24 2020 +0200
avoid syntax color when not useful
---
.../examples/adding-filtering-webresources.apt.vm | 16 +++++------
src/site/apt/examples/skinny-wars.apt.vm | 4 +--
src/site/apt/index.apt.vm | 4 +--
src/site/apt/overlays.apt.vm | 12 ++++----
src/site/apt/usage.apt.vm | 32 +++++++++++-----------
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/site/apt/examples/adding-filtering-webresources.apt.vm b/src/site/apt/examples/adding-filtering-webresources.apt.vm
index a4253f6..91c30ca 100644
--- a/src/site/apt/examples/adding-filtering-webresources.apt.vm
+++ b/src/site/apt/examples/adding-filtering-webresources.apt.vm
@@ -64,7 +64,7 @@ Adding and Filtering External Web Resources
Using our sample project in the {{{../usage.html}usage section}} with an added external resource, like this:
-+----------+
+----------
.
|-- pom.xml
|-- resource2
@@ -87,7 +87,7 @@ Adding and Filtering External Web Resources
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
would end up in the WAR as:
@@ -228,7 +228,7 @@ documentedproject-1.0-SNAPSHOT.war
Using our example above, we can also configure filters for our resources.
We will add a hypothetical <<<configurations>>> directory to our project:
-+----------+
+----------
.
|-- configurations
| |-- config.cfg
@@ -255,7 +255,7 @@ documentedproject-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
To prevent corrupting your binary files when filtering is enabled, you can configure a list of file extensions that
will not be filtered.
@@ -307,7 +307,7 @@ interpolated_property=some_config_value
The resulting WAR would be:
-+----------+
+----------
documentedproject-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
@@ -332,7 +332,7 @@ documentedproject-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
and the content of <<<config.cfg>>> would be:
@@ -379,7 +379,7 @@ documentedproject-1.0-SNAPSHOT.war
Using the sample project the resulting WAR would look like this:
-+----------+
+----------
documentedproject-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
@@ -404,4 +404,4 @@ documentedproject-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
diff --git a/src/site/apt/examples/skinny-wars.apt.vm b/src/site/apt/examples/skinny-wars.apt.vm
index 55b6c18..89585de 100644
--- a/src/site/apt/examples/skinny-wars.apt.vm
+++ b/src/site/apt/examples/skinny-wars.apt.vm
@@ -91,7 +91,7 @@ Creating Skinny WARs
Your EAR will contain something like this:
-+-----------------+
+-----------------
.
|-- META-INF
| `-- application.xml
@@ -99,7 +99,7 @@ Creating Skinny WARs
| `-- shared-jar-1.0.0.jar
|-- war1-1.0.0.war
`-- war2-1.0.0.war
-+-----------------+
+-----------------
* Alternatives
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index aba5e21..d043dde 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -80,7 +80,7 @@ ${project.name}
Of course, patches are welcome, too. Contributors can check out the project from
our {{{./scm.html}source repository}} and will find supplementary
information in the
- {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
+ {{{/guides/development/guide-helping.html}guide to helping with Maven}}.
* Examples
@@ -103,6 +103,6 @@ ${project.name}
* Related links
- * {{{http://maven.apache.org/guides/mini/guide-archive-configuration.html}Exclusion of Maven Descriptors}}
+ * {{{/guides/mini/guide-archive-configuration.html}Exclusion of Maven Descriptors}}
[]
diff --git a/src/site/apt/overlays.apt.vm b/src/site/apt/overlays.apt.vm
index 894c9de..f5e3651 100644
--- a/src/site/apt/overlays.apt.vm
+++ b/src/site/apt/overlays.apt.vm
@@ -38,7 +38,7 @@ Overlays
To demonstrate, given this structure for the project <<<documentedproject>>>:
-+-----------------+
+-----------------
|-- pom.xml
`-- src
`-- main
@@ -57,7 +57,7 @@ Overlays
|-- index.jsp
`-- jsp
`-- websource.jsp
-+-----------------+
+-----------------
The project depends on another WAR artifact, <<<documentedprojectdependency-1.0-SNAPSHOT.war>>>,
which is declared as a dependency in the project's <<<pom.xml>>>:
@@ -79,7 +79,7 @@ Overlays
The structure for the <<<documentedprojectdependency>>> WAR file looks like this:
-+-----------------+
+-----------------
documentedprojectdependency-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
@@ -98,11 +98,11 @@ documentedprojectdependency-1.0-SNAPSHOT.war
| | `-- sampleimage-dependency.jpg
| `-- web.xml
`-- index-dependency.jsp
-+-----------------+
+-----------------
The resulting WAR would end up like this:
-+-----------------+
+-----------------
|-- META-INF
| |-- MANIFEST.MF
| `-- maven
@@ -125,7 +125,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+-----------------+
+-----------------
The <<<web.xml>>> file above comes from <<<documentedproject>>>.
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index ab830c0..3e3b1cc 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -70,7 +70,7 @@ Usage
The project's structure looks like this:
-+----------+
+----------
|-- pom.xml
`-- src
`-- main
@@ -88,23 +88,23 @@ Usage
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
Invoking
-+----------+
+----------
mvn package
-+----------+
+----------
or
-+----------+
+----------
mvn compile war:war
-+----------+
+----------
will generate the WAR file <<<target/documentedproject-1.0-SNAPSHOT.war>>>. Here are the contents of that WAR file:
-+----------+
+----------
documentedproject-1.0-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
@@ -125,7 +125,7 @@ documentedproject-1.0-SNAPSHOT.war
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
*Invocation of <<<war:exploded>>> goal
@@ -133,14 +133,14 @@ documentedproject-1.0-SNAPSHOT.war
form.
Use the same project as above and invoke:
-+----------+
+----------
mvn compile war:exploded
-+----------+
+----------
This will generate an exploded version of the WAR in <<<target/documentedproject-1.0-SNAPSHOT>>>.
The contents of that directory looks like this:
-+----------+
+----------
documentedproject-1.0-SNAPSHOT
|-- META-INF
|-- WEB-INF
@@ -155,7 +155,7 @@ mvn compile war:exploded
|-- index.jsp
`-- jsp
`-- websource.jsp
-+----------+
+----------
The default directory for the exploded WAR is <<<target/\<finalName\>>>>. The <<<finalName>>> is usually in the form
of <<<\<artifactId\>-\<version\>>>>.
@@ -186,13 +186,13 @@ mvn compile war:exploded
in the webapp source, which defaults to <<<src/main/webapp>>>.
Use our sample project above, and invoke:
-+----------+
+----------
mvn compile war:inplace
-+----------+
+----------
This will result in:
-+----------+
+----------
|-- pom.xml
|-- src
| `-- main
@@ -226,4 +226,4 @@ mvn compile war:inplace
| `-- SampleAction.class
`-- images
`-- sampleimage.jpg
-+----------+
+----------