Author: brianf
Date: Sat Apr 7 20:36:56 2007
New Revision: 526523
URL: http://svn.apache.org/viewvc?view=rev&rev=526523
Log:
MNG-2885 improved OS activation info by linking to the enforcer plugin page
with info about os family values
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-profiles.apt
maven/site/trunk/src/site/apt/pom.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-profiles.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-profiles.apt?view=diff&rev=526523&r1=526522&r2=526523
==============================================================================
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-profiles.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-profiles.apt
Sat Apr 7 20:36:56 2007
@@ -91,7 +91,7 @@
the value of a system property. Here are some examples.
The follwing configuration will trigger the profile when the JDK's
- version starts with "1.4" (eg. "1.4.0_08", "1.4.2_07", "1.4"):
+ version starts with "1.4" (eg. "1.4.0_08", "1.4.2_07", "1.4"):
+---+
<profiles>
@@ -99,6 +99,24 @@
<activation>
<jdk>1.4</jdk>
</activation>
+ ...
+ </profile>
+</profiles>
++---+
+
+ This next one will activate based on OS settings. See the
{{{http://maven.apache.org/plugins/maven-enforcer-plugin/rules/requireOS.html}maven-enforcer-plugin}}
for more details about OS values.
+
++---+
+<profiles>
+ <profile>
+ <activation>
+ <os>
+ <name>Windows XP</name>
+ <family>Windows</family>
+ <arch>x86</arch>
+ <version>5.1.2600</version>
+ </os>
+ </activation>
...
</profile>
</profiles>
Modified: maven/site/trunk/src/site/apt/pom.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?view=diff&rev=526523&r1=526522&r2=526523
==============================================================================
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Sat Apr 7 20:36:56 2007
@@ -1679,7 +1679,8 @@
will match.
* <<os>>:
- The <<<os>>> element can define some operating system specific properties
shown above.
+ The <<<os>>> element can define some operating system specific properties
shown above. See the
{{{http://maven.apache.org/plugins/maven-enforcer-plugin/rules/requireOS.html}maven-enforcer-plugin}}
for more details about OS values.
+
* <<property>>:
The <<<profile>>> will activate if Maven detects a property (a value which
can be dereferenced within the POM by <<<$\{name\}>>>)
