You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/15 11:21:46 UTC
svn commit: r985637 - in /maven/plugins/trunk/maven-war-plugin/src/site:
apt/ apt/examples/ fml/
Author: dennisl
Date: Sun Aug 15 09:21:45 2010
New Revision: 985637
URL: http://svn.apache.org/viewvc?rev=985637&view=rev
Log:
o Polish the site.
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt.vm
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm
maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt.vm?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt.vm (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt.vm Sun Aug 15 09:21:45 2010
@@ -35,7 +35,7 @@ Adding and Filtering External Web Resour
The WAR Plugin is also capable of including resources not found in the default resource
directory through the <<<webResources>>> parameter.
-*POM configuration
+*Adding web resources
+-------+
<project>
@@ -78,9 +78,8 @@ Adding and Filtering External Web Resour
| `-- projects
| `-- SampleAction.java
|-- resources
- | |-- images
- | | `-- sampleimage.jpg
- | `-- sampleresource
+ | `-- images
+ | `-- sampleimage.jpg
`-- webapp
|-- WEB-INF
| `-- web.xml
@@ -120,7 +119,7 @@ documentedproject-1.0-SNAPSHOT.war
<<<external-resource2.jpg>>> and <<<image2>>> are copied to the root of the WAR, preserving the
directory structure.
-*Configuring webResources
+*Configuring web Resources
<<<webResources>>> is a list of resources. All options of resource are supported.
@@ -245,9 +244,8 @@ documentedproject-1.0-SNAPSHOT.war
| `-- projects
| `-- SampleAction.java
|-- resources
- | |-- images
- | | `-- sampleimage.jpg
- | `-- sampleresource
+ | `-- images
+ | `-- sampleimage.jpg
`-- webapp
|-- WEB-INF
| `-- web.xml
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/file-name-mapping.apt Sun Aug 15 09:21:45 2010
@@ -43,7 +43,7 @@ Using File Name Mapping
The <<<outputFileNameMapping>>> parameter allows you to give a custom pattern. Each token defined in the
pattern will be replaced with a value from the current artifact. You can use any property of Artifact and
- ArtifactHandler as a token. There is also a special token named <<<dashClassifier?>>> that can be used, since 2.1-beta-2.
+ ArtifactHandler as a token. There is also a special token named <<<dashClassifier?>>> that can be used, since 2.1.
It will add the string "-yourclassifier" if and only if the artifact has a classifier.
For instance, to store the libraries and TLDs without version numbers or classifiers, use the following pattern:
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/rapid-testing-jetty6-plugin.apt Sun Aug 15 09:21:45 2010
@@ -28,12 +28,12 @@
Rapid Testing Using the Jetty Plugin
- Normally, testing a web application involves compiling java sources, creating a WAR and
+ Normally, testing a web application involves compiling Java sources, creating a WAR and
deploying it to a web container.
Using the Jetty Plugin enables you to quickly test your web application by skipping
- the last two steps. By default the Jetty Plugin scans your <<<target/classes>>> for
- any changes in your java sources and <<<src/main/webapp>>> for your web sources.
+ the last two steps. By default the Jetty Plugin scans <<<target/classes>>> for
+ any changes in your Java sources and <<<src/main/webapp>>> for changes to your web sources.
The Jetty Plugin will automatically reload the modified classes and web sources.
To use the Jetty Plugin just add the following in your <<<pom.xml>>>:
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt.vm Sun Aug 15 09:21:45 2010
@@ -69,7 +69,7 @@ Creating Skinny WARs
This is useful when there is a need to package a small, but non-empty, subset
of JARs into the WAR. When making an EAR of skinny WARs, one wants to package
all of the JARs into the EAR. Sometimes a list of JARs must be packaged into
- the WAR though in order for it to work properly, like tag libraries.
+ the WAR though in order for it to work properly, like with tag libraries.
+-----------------+
<project>
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/index.apt Sun Aug 15 09:21:45 2010
@@ -3,7 +3,7 @@
------
Pete Marvin King
------
- 2009-03-08
+ 2010-08-15
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -40,10 +40,10 @@ Maven WAR Plugin
an exploded webapp in a specified directory.
* {{{./inplace-mojo.html}war:inplace}} another variation of <<<war:explode>>> where the webapp is instead generated in the
- web source directory, which is <<<src/main/webapp>>> by default.
+ web application source directory, which is <<<src/main/webapp>>> by default.
* {{{./manifest-mojo.html}war:manifest}} generates a manifest for this webapp. The manifest file is created in the
- <<<warSourceDirectory>>>.
+ web application source directory.
[]
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm Sun Aug 15 09:21:45 2010
@@ -3,7 +3,7 @@
------
Pete Marvin King
------
- 2008-08-03
+ 2010-08-15
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -45,7 +45,7 @@ Usage
*Using the <<<package>>> phase with the project package type as war / invocation of the <<<war:war>>> goal
- This is the general way of using the WAR Plugin.
+ This is the normal way of using the WAR Plugin.
To illustrate, here's the <<<pom.xml>>> for our project:
+----------+
@@ -64,7 +64,6 @@ Usage
The project's structure looks like this:
+----------+
- .
|-- pom.xml
`-- src
`-- main
@@ -74,9 +73,8 @@ Usage
| `-- projects
| `-- SampleAction.java
|-- resources
- | |-- images
- | | `-- sampleimage.jpg
- | `-- sampleresource
+ | `-- images
+ | `-- sampleimage.jpg
`-- webapp
|-- WEB-INF
| `-- web.xml
@@ -188,7 +186,6 @@ mvn compile war:inplace
This will result in:
+----------+
- .
|-- pom.xml
|-- src
| `-- main
@@ -198,9 +195,8 @@ mvn compile war:inplace
| | `-- projects
| | `-- SampleAction.java
| |-- resources
- | | |-- images
- | | | `-- sampleimage.jpg
- | | `-- sampleresource
+ | | `-- images
+ | | `-- sampleimage.jpg
| `-- webapp
| |-- META-INF
| |-- WEB-INF
Modified: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml?rev=985637&r1=985636&r2=985637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml Sun Aug 15 09:21:45 2010
@@ -59,13 +59,13 @@ under the License.
<question>What's the difference between using dependentWarExclude and provided scope?</question>
<answer>
<p><code>dependentWarExclude</code> is used in <a href="overlays.html">overlays</a> for excluding dependent
- WAR files from the exploded webapp.</p>
+ WAR files from the assembled webapp.</p>
</answer>
</faq>
<faq id="webresourcesexclude">
<question>How do I exclude files in my web resources?</question>
<answer>
- <p>Use the <code>webResources</code> <code>exclude</code> parameter to identify the tokens to exclude.</p>
+ <p>Use the <code><webResources></code> / <code><exclude></code> parameter to identify the tokens to exclude.</p>
<p>For more information refer to <a href="examples/adding-filtering-webresources.html">Adding and Filtering
External Web Resources</a>.</p>
</answer>