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 2008/07/31 23:06:19 UTC
svn commit: r681497 - in /maven/sandbox/trunk/shared/maven-filtering:
pom.xml src/site/apt/index.apt src/site/apt/usage.apt src/site/site.xml
Author: dennisl
Date: Thu Jul 31 14:06:18 2008
New Revision: 681497
URL: http://svn.apache.org/viewvc?rev=681497&view=rev
Log:
o Site tweaks.
Modified:
maven/sandbox/trunk/shared/maven-filtering/pom.xml
maven/sandbox/trunk/shared/maven-filtering/src/site/apt/index.apt
maven/sandbox/trunk/shared/maven-filtering/src/site/apt/usage.apt
maven/sandbox/trunk/shared/maven-filtering/src/site/site.xml
Modified: maven/sandbox/trunk/shared/maven-filtering/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/pom.xml?rev=681497&r1=681496&r2=681497&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/pom.xml (original)
+++ maven/sandbox/trunk/shared/maven-filtering/pom.xml Thu Jul 31 14:06:18 2008
@@ -35,7 +35,7 @@
<packaging>jar</packaging>
<version>1.0-beta-1-SNAPSHOT</version>
- <name>Maven Files Filtering</name>
+ <name>Maven Filtering</name>
<issueManagement>
<system>jira</system>
@@ -49,6 +49,14 @@
</scm>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -62,10 +70,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
- </plugin>
</plugins>
</build>
Modified: maven/sandbox/trunk/shared/maven-filtering/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/site/apt/index.apt?rev=681497&r1=681496&r2=681497&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/site/apt/index.apt (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/site/apt/index.apt Thu Jul 31 14:06:18 2008
@@ -23,24 +23,24 @@
~~ specific language governing permissions and limitations
~~ under the License.
-Maven Filtering Component
+Maven Filtering Components
- This Plexus components has been build with the filtering process/code coming from the maven-resources-plugin.
+ These Plexus components have been built with the filtering process/code coming from the maven-resources-plugin.
- The goal is to provide a common way for all plugins which needs to filtering resources.
+ The goal is to provide a common way for all plugins which needs to filter resources.
* Component MavenResourcesFiltering
- This component will apply filtering on a List of org.apache.maven.model.Resource.
+ This component will apply filtering on a <<<List>>> of <<<org.apache.maven.model.Resource>>>.
- The method without the filterWrappers parameter will interpolate the files using the default List of FileUtils.FilterWrapper (see above).
+ The method without the <<<filterWrappers>>> parameter will interpolate the files using the default <<<List>>> of <<<FileUtils.FilterWrapper>>> (see below).
- The component will not filtering some predefined file extensions (jpg,jpeg,gif,bmp,png). Note: you can easily add extra file extensions.
+ The component will not filter some predefined file extensions (jpg, jpeg, gif, bmp, png). Note: you can easily add extra file extensions.
* Component MavenFileFilter
- This component has a method which returns the default FileUtils.FilterWrapper.
- This are:
+ This component has a method which returns the default <<<FileUtils.FilterWrapper>>>.
+ These are:
* interpolation with token $\{ \} and values from filters, project.filters, project.build.filters, pom.properties and mavenSession.executionProperties
@@ -54,7 +54,7 @@
The values (Properties object) used for interpolation are loaded with the following order:
- * List of properties file ( the method has a parameter which accept a List of String -> path properties files )
+ * List of properties files (the method has a parameter which accept a <<<List>>> of String -> path properties files)
* pom.filters
@@ -66,7 +66,7 @@
[]
- <<NOTE>>: As it's a Properties object, last defined key/value pair wins .
+ <<Note>>: As it's a <<<Properties>>> object, the last defined key/value pair wins.
- <<NOTE>>: When building the global Properties object and reading the properties files defined the different filters,
- interpolation with the token $\{ \} is supported for this filters with a limited properties values coming from pom.properties and mavenSession.executionProperties (last wins too)
+ <<Note>>: When building the global <<<Properties>>> object and reading the properties files defined the different filters,
+ interpolation with the token $\{ \} is supported for this filters with a limited properties values coming from pom.properties and mavenSession.executionProperties (last wins too).
Modified: maven/sandbox/trunk/shared/maven-filtering/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/site/apt/usage.apt?rev=681497&r1=681496&r2=681497&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/site/apt/usage.apt (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/site/apt/usage.apt Thu Jul 31 14:06:18 2008
@@ -1,5 +1,5 @@
------
- Basic Usage
+ Usage
------
Olivier Lamy
------
@@ -23,11 +23,11 @@
~~ specific language governing permissions and limitations
~~ under the License.
-Maven Filtering Component Basic Usage
+Usage
* Filtering a List of org.apache.maven.model.Resource.
- Lookup the component in your Mojo
+ Lookup the component in your Mojo:
+-----+
@@ -39,7 +39,7 @@
+-----+
- Apply filtering on your resources List (see {{{./index.html}Reference}} to see the default FilterWrappers used).
+ Apply filtering on your resources List (see {{{./index.html}Reference}} to see the default FilterWrappers that are used).
+-----+
@@ -66,9 +66,10 @@
* Adding new filtering Token
- You must use the other methods from the MavenResourcesFiltering component and construct your own List of FilterWrapper.
- The following example add the interpolation for the Token @ @ with using values coming from reflection with the Maven Project.\
- NOTE: the component maven-filtering use the {{{http://plexus.codehaus.org/plexus-components/plexus-interpolation/}plexus-interpolation component}}.
+ You must use the other methods from the <<<MavenResourcesFiltering>>> component and construct your own List of FilterWrapper.
+ The following example add the interpolation for the Token @ @ with using values coming from reflection with the Maven Project.
+
+ <<Note:>> The component maven-filtering uses the {{{http://plexus.codehaus.org/plexus-components/plexus-interpolation/}plexus-interpolation component}}.
+-----+
Modified: maven/sandbox/trunk/shared/maven-filtering/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/site/site.xml?rev=681497&r1=681496&r2=681497&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-filtering/src/site/site.xml (original)
+++ maven/sandbox/trunk/shared/maven-filtering/src/site/site.xml Thu Jul 31 14:06:18 2008
@@ -18,35 +18,10 @@
under the License.
-->
<project>
- <!-- TODO: Most of the stuff in this file should be inherited from the shared parent -->
- <!-- TODO: banners, skin, publish date, version should be inherited from Maven itself -->
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-logo-2.gif</src>
- </bannerRight>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- </skin>
- <publishDate format="dd MMM yyyy" position="left" />
- <version position="left" />
<body>
<menu name="Overview">
<item name="Reference" href="index.html"/>
<item name="Usage" href="usage.html"/>
</menu>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
- <menu ref="reports" inherit="bottom" />
</body>
</project>