You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/07/12 09:05:47 UTC
svn commit: r555510 - in /maven/site/trunk/src/site/apt/guides:
development/guide-plugin-documentation.apt getting-started/index.apt
introduction/introduction-to-plugins.apt mini/guide-m1-m2.apt
mini/guide-site.apt
Author: aheritier
Date: Thu Jul 12 00:05:46 2007
New Revision: 555510
URL: http://svn.apache.org/viewvc?view=rev&rev=555510
Log:
Fix some deprecated links to http://maven.apache.org/maven2
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
maven/site/trunk/src/site/apt/guides/getting-started/index.apt
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugins.apt
maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
maven/site/trunk/src/site/apt/guides/mini/guide-site.apt
Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt?view=diff&rev=555510&r1=555509&r2=555510
==============================================================================
--- maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt (original)
+++ maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Thu Jul 12 00:05:46 2007
@@ -180,7 +180,7 @@
+--------------+
<body>
<links>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ <item name="Maven 2" href="http://maven.apache.org/"/>
</links>
<menu name="Overview">
Modified: maven/site/trunk/src/site/apt/guides/getting-started/index.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/index.apt?view=diff&rev=555510&r1=555509&r2=555510
==============================================================================
--- maven/site/trunk/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/getting-started/index.apt Thu Jul 12 00:05:46 2007
@@ -1251,8 +1251,8 @@
<body>
<links>
<item name="Apache" href="http://www.apache.org/" />
- <item name="Maven 1.0" href="http://maven.apache.org/"/>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ <item name="Maven 1.0" href="http://maven.apache.org/maven-1.x"/>
+ <item name="Maven 2" href="http://maven.apache.org/"/>
</links>
<menu name="Maven 2.0">
Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugins.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugins.apt?view=diff&rev=555510&r1=555509&r2=555510
==============================================================================
--- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugins.apt (original)
+++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugins.apt Thu Jul 12 00:05:46 2007
@@ -49,12 +49,12 @@
description of each plugin goal (or Mojo).
One of the simplest plugins in Maven 2.0 is the Clean Plugin. The
- {{{http://maven.apache.org/maven2/plugins/maven-clean-plugin/}Maven
+ {{{/plugins/maven-clean-plugin/}Maven
Clean plugin}} (maven-clean-plugin) is responsible for removing the target
directory of a Maven 2 project. When you run "mvn clean", Maven 2 executes
the "clean" goal as defined in the Clean plug-in, and the target directory
is removed. The Clean plugin
- {{{http://maven.apache.org/maven2/plugins/maven-clean-plugin/clean-mojo.html}defines
+ {{{/plugins/maven-clean-plugin/clean-mojo.html}defines
a parameter}} which can be used to customize plugin behavior, this parameter is
called outputDirectory and it defaults to ${project.build.directory}.
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt?view=diff&rev=555510&r1=555509&r2=555510
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt Thu Jul 12 00:05:46 2007
@@ -91,30 +91,30 @@
+----+
For more details, check out the
- {{{http://maven.apache.org/maven2/guides/introduction/introduction-to-the-pom.html}POM Guide}}.
+ {{{/guides/introduction/introduction-to-the-pom.html}POM Guide}}.
* build.properties and project.properties
These files have been replaced with
- {{{http://maven.apache.org/maven2/maven-settings/settings.html}settings.xml}}.
+ {{{/settings.html}settings.xml}}.
Like with the POM, you can establish a parallel build environment, so the m1 build
never breaks while the m2 build is being debugged.
Additional local build customization options can also be created using
- {{{http://maven.apache.org/maven2/guides/introduction/introduction-to-profiles.html}profiles}}.
+ {{{/guides/introduction/introduction-to-profiles.html}profiles}}.
* What to do with maven.xml?
- See {{http://maven.apache.org/maven2/maven1.html#m1-maven-xml}} for an explanation of
+ See {{/maven1.html#m1-maven-xml}} for an explanation of
why maven.xml was discarded, and
- {{http://maven.apache.org/maven2/guides/introduction/introduction-to-plugins.html}} for
+ {{/guides/introduction/introduction-to-plugins.html}} for
a guide to writing your own plug-ins.
* Directory Structure
The POM allows customization of the directory structure in both Maven 1 and Maven 2
using the <<<\<build\>>>> tag. For simplicity, it would be ideal to move source to the
- {{{http://maven.apache.org/maven2/guides/introduction/introduction-to-the-standard-directory-layout.html}Maven 2 default structure}},
+ {{{/guides/introduction/introduction-to-the-standard-directory-layout.html}Maven 2 default structure}},
but it is not required. You can begin by customizing the
directories in Maven 2, then when satisfied that both build paths are working, move
to the Maven 2 structure and customize the settings in Maven 1.
@@ -125,25 +125,25 @@
a build cycle in Maven 2. Instead of using <<<preGoal>>> and <<<postGoal>>> tags
in <<<maven.xml>>> to tie plugin goals into the build process, the goals of a
plugin are associated with the pre-defined stages of the build cycle. See the
- {{{http://maven.apache.org/maven2/guides/introduction/introduction-to-the-lifecycle.html}Introduction to the Build Lifecycle}}
+ {{{/guides/introduction/introduction-to-the-lifecycle.html}Introduction to the Build Lifecycle}}
for more on how plugins relate.
** Re-use Ant Tasks
- See the {{{http://maven.apache.org/maven2/general.html#using-ant-tasks}Ant Script FAQ}}.
+ See the {{{/general.html#using-ant-tasks}Ant Script FAQ}}.
** Replace scripts with Mojos
The new plugin architecture does not specify a specific language implementation, so
Jelly scripts and other such artifacts should be re-usable with wrappers. It is recommended
that you look into moving to
- {{{http://maven.apache.org/maven2/guides/plugin/guide-java-plugin-development.html}Mojos}}.
+ {{{/guides/plugin/guide-java-plugin-development.html}Mojos}}.
** Utilize built-in Maven 2 capabilities
*** Resource filtering to inject POM variables into application
- You can turn on {{{http://maven.apache.org/maven2/guides/getting-started/index.html#How do I filter resource files?}resource filtering}}
+ You can turn on {{{/guides/getting-started/index.html#How do I filter resource files?}resource filtering}}
in your POM. Tokens of the form <<<$\{pom.variable\}>>> in resource files will be replaced with the corresponding POM property.
+----+
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-site.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-site.apt?view=diff&rev=555510&r1=555509&r2=555510
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-site.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-site.apt Thu Jul 12 00:05:46 2007
@@ -106,7 +106,7 @@
<links>
<item name="Apache" href="http://www.apache.org/" />
<item name="Maven 1.0" href="http://maven.apache.org/"/>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ <item name="Maven 2" href="/"/>
</links>
<menu name="Maven 2.0">