You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/10/19 06:29:36 UTC

svn commit: r326378 - in /maven/components/trunk/maven-site/src/site/apt: ./ guides/getting-started/ guides/introduction/ guides/mini/ guides/mini/guide-ide-netbeans/ guides/plugin/ guides/suggestions/

Author: jvanzyl
Date: Tue Oct 18 21:29:22 2005
New Revision: 326378

URL: http://svn.apache.org/viewcvs?rev=326378&view=rev
Log:
o change m2 references to mvn

Modified:
    maven/components/trunk/maven-site/src/site/apt/download.apt
    maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
    maven/components/trunk/maven-site/src/site/apt/guides/introduction/profile-example.txt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-assemblies.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ear.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-releasing.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-site.apt
    maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-webapp.apt
    maven/components/trunk/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt
    maven/components/trunk/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt

Modified: maven/components/trunk/maven-site/src/site/apt/download.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/download.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/download.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/download.apt Tue Oct 18 21:29:22 2005
@@ -64,7 +64,7 @@
   [[3]] In the same dialog, make sure that <<<JAVA_HOME>>> is set to the location of your JDK,
         eg. <<<C:\Program Files\Java\jdk1.5.0_02>>>
 
-  [[4]] Run <<<m2 --version>>> to verify that it is correctly installed.
+  [[4]] Run <<<mvn --version>>> to verify that it is correctly installed.
 
 ** Unix-based Operating Systems (Linux, Solaris and Mac OS X)
 
@@ -77,5 +77,5 @@
   [[3]] Make sure that <<<JAVA_HOME>>> is set to the location of your JDK, eg.
         <<<export JAVA_HOME=/usr/java/jdk1.5.0_02>>>
 
-  [[4]] Run <<<m2 --version>>> to verify that it is correctly installed.
+  [[4]] Run <<<mvn --version>>> to verify that it is correctly installed.
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt Tue Oct 18 21:29:22 2005
@@ -105,7 +105,7 @@
 
 +-----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app
 
 +-----+
 
@@ -227,7 +227,7 @@
 
 +-----+
 
-m2 compile
+mvn compile
 
 +-----+
 
@@ -281,7 +281,7 @@
 
 +----+
 
-m2 test
+mvn test
 
 +----+
 
@@ -335,7 +335,7 @@
 
 +----+
 
- m2 test-compile
+ mvn test-compile
 
 +----+
 
@@ -350,7 +350,7 @@
 
 +----+
 
-m2 package
+mvn package
 
 +----+
 
@@ -365,7 +365,7 @@
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -444,7 +444,7 @@
 
 +----+
 
-m2 site
+mvn site
 
 +----+
 
@@ -639,7 +639,7 @@
 
 +----+
 
-m2 process-resources
+mvn process-resources
 
 +----+
 
@@ -710,7 +710,7 @@
 
 +----+
 
- the next execution of the <<<m2 process-resources>>> command will put our new property value into application.properties.
+ the next execution of the <<<mvn process-resources>>> command will put our new property value into application.properties.
  As an alternative to defining the my.filter.value property in an external file, you could also have defined it in the <<<properties>>>
  section of your pom.xml and you'd get the same effect (notice I don't need the references to src/main/filters/filter.properties either):
 
@@ -765,7 +765,7 @@
 
 +----+
 
-m2 process-resources "-Dcommand.line.prop=hello again"
+mvn process-resources "-Dcommand.line.prop=hello again"
 
 +----+
 
@@ -912,7 +912,7 @@
 
 +----+
 
- Now, when we compile the project (<<<m2 compile>>>), we'll see Maven download the log4j dependency for us.
+ Now, when we compile the project (<<<mvn compile>>>), we'll see Maven download the log4j dependency for us.
 
 ~~DJ: Current
 
@@ -996,7 +996,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-site
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-site
 
 +----+
 
@@ -1070,7 +1070,7 @@
  Generating the site is very simple, and fast!
 
 ---------------
-m2 site
+mvn site
 ---------------
 
  The resulting site will be in <<<target/site/...>>>
@@ -1097,7 +1097,7 @@
   You must presently run the <<<site:site>>> goal independantly.
 
 ---------------
-m2 site-deploy
+mvn site-deploy
 ---------------
 
   <<Note:>> the trailing slash in the URL above indicates that any subprojects that inherit this value should append their artifact ID to

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt Tue Oct 18 21:29:22 2005
@@ -67,7 +67,7 @@
   from the model:
 
 +---+
-m2 -Dversion=4.0.0 -Dmodel=maven.mdo modello:java
+mvn -Dversion=4.0.0 -Dmodel=maven.mdo modello:java
 +---+
 
   Adding <<org.codehaus.modello>> to the list of groupIds searched for plugin

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-plugins.apt Tue Oct 18 21:29:22 2005
@@ -45,7 +45,7 @@
   One of the simplest plugins in Maven 2.0 is the Clean Plugin.  The 
   {{{http://maven.apache.org/maven2/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 "m2 clean:clean", Maven 2 executes
+  directory of a Maven 2 project.  When you run "mvn clean:clean", Maven 2 executes
   the "clean: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 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-profiles.apt Tue Oct 18 21:29:22 2005
@@ -288,13 +288,13 @@
   system properties contain "env=dev". So, executing:
 
 +---+
-m2 -Denv=dev integration-test
+mvn -Denv=dev integration-test
 +---+
 
   should result in a successful build. However, this won't:
 
 +---+
-m2 -Denv=production integration-test
+mvn -Denv=production integration-test
 +---+
 
   Why? Because, the resulting non-interpolated literal value of $\{appserver.home\}
@@ -334,7 +334,7 @@
   you need to activate <<env-test>> by issuing:
 
 +---+
-m2 -Denv=test <phase>
+mvn -Denv=test <phase>
 +---+
 
   The right command-line option can be had by simply substituting "=" for "-" in
@@ -348,7 +348,7 @@
   To see the list of active profiles, issue:
 
 +---+
-m2 projecthelp:active-profiles -Denv=test
+mvn projecthelp:active-profiles -Denv=test
 +---+
 
   This should render a bulleted list of the profiles (hopefully including one
@@ -358,7 +358,7 @@
   POM, issue:
 
 +---+
-m2 projecthelp:effective-pom -Denv=test
+mvn projecthelp:effective-pom -Denv=test
 +---+
 
   This will print the effective POM for this build configuration out to the 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-repositories.apt Tue Oct 18 21:29:22 2005
@@ -99,7 +99,7 @@
 
 +---+
 
- m2 -o package
+ mvn -o package
 
 +---+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt Tue Oct 18 21:29:22 2005
@@ -41,7 +41,7 @@
   you desire on the command line. For example:
 
 -------
-m2 install
+mvn install
 -------
 
   This command will compile, test, package, verify and install the package into the local repository when run.
@@ -51,7 +51,7 @@
   It should also be noted that the same command can be used in a multi-module scenario. For example;
 
 ------
-m2 clean:clean install
+mvn clean:clean install
 ------
 
   This command will traverse into all of the subprojects and run <<<clean:clean>>>, then <<<install>>> (including all of

Modified: maven/components/trunk/maven-site/src/site/apt/guides/introduction/profile-example.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/introduction/profile-example.txt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/introduction/profile-example.txt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/introduction/profile-example.txt Tue Oct 18 21:29:22 2005
@@ -29,10 +29,10 @@
      </profile>
    </profiles>
 
-and you can run m2 with one of profiles like :
-m2 -P env-production clean:clean install ==> we use the profile id
+and you can run mvn with one of profiles like :
+mvn -P env-production clean:clean install ==> we use the profile id
 or
-m2 -Denv=test clean:clean install ==> we use the property env define in 
+mvn -Denv=test clean:clean install ==> we use the property env define in
 <activation>
 
 Emmanuel

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-assemblies.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-assemblies.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-assemblies.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-assemblies.apt Tue Oct 18 21:29:22 2005
@@ -142,7 +142,7 @@
 
 +----+
 
-m2 assembly:assembly
+mvn assembly:assembly
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-attached-tests.apt Tue Oct 18 21:29:22 2005
@@ -42,7 +42,7 @@
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -53,7 +53,7 @@
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-bash-m2-completion.apt Tue Oct 18 21:29:22 2005
@@ -45,7 +45,7 @@
   COMPREPLY=($(compgen -W "${goals}" ${cur} | sed 's/\\\\//g') )
 }
 
-complete -F _m2_complete -o filenames m2
+complete -F _m2_complete -o filenames mvn
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt Tue Oct 18 21:29:22 2005
@@ -69,7 +69,7 @@
 
 +----+
 
-m2 install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> \
+mvn install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> \
     -DartifactId=<artifact-id> -Dversion=<version> -Dpackaging=<packaging>
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-creating-archetypes.apt Tue Oct 18 21:29:22 2005
@@ -56,7 +56,7 @@
 
 +----+
 
-m2 install
+mvn install
 
 +----+
 
@@ -64,7 +64,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app \
+mvn archetype:create -DgroupId=com.mycompany.app \
     -DartifactId=my-archetype -DarchetypeGroupId=<artifact-group-id> -DarchetypeArtifactId=<archetype-artifact-id>
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ftp.apt Tue Oct 18 21:29:22 2005
@@ -88,6 +88,6 @@
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-deploy-ssh-external.apt Tue Oct 18 21:29:22 2005
@@ -67,6 +67,6 @@
 
 +----+
 
-m2 deploy
+mvn deploy
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ear.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ear.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ear.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ear.apt Tue Oct 18 21:29:22 2005
@@ -8,7 +8,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-ear
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-ear
 
 +----+
 
@@ -39,7 +39,7 @@
 
 +----+
 
-m2 clean package
+mvn clean package
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-generating-sources.apt Tue Oct 18 21:29:22 2005
@@ -46,7 +46,7 @@
 
 +----+
 
- If you then type "m2 compile" m2 will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
+ If you then type "mvn compile" m2 will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
  and will eventually hit the <<<generate-sources>>> phase and see you have a plugin configured that
  wants to participate in that phase and the antlr plugin is executed with
  your given configuration.

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt Tue Oct 18 21:29:22 2005
@@ -12,6 +12,6 @@
 
 +----+
 
-m2 eclipse:eclipse
+mvn eclipse:eclipse
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-idea.apt Tue Oct 18 21:29:22 2005
@@ -12,6 +12,6 @@
 
 +----+
 
-m2 idea:idea
+mvn idea:idea
 
 +----+

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt Tue Oct 18 21:29:22 2005
@@ -1,7 +1,7 @@
     ------
     Guide to Using maven 2 in Netbeans 4.0 (4.1 and 5.0)
     ------
-    Raphaël Piéroni
+    Rapha�l Pi�roni
     ------
     Mon Aug 9 2005
     ------
@@ -34,7 +34,7 @@
     You can also checkout the Maven 2 project using your versionning system.
 
 -------------------
-[maven-user@mini-guide examples]$ m2 archetype:create -DarchetypeArtifactId=maven-archetype-quickstart -DartifactId=demoquickstart -DgroupId=demoquickstart
+[maven-user@mini-guide examples]$ mvn archetype:create -DarchetypeArtifactId=maven-archetype-quickstart -DartifactId=demoquickstart -DgroupId=demoquickstart
 
 [INFO] Searching repository for plugin with prefix: 'archetype'.
 [INFO] ----------------------------------------------------------------------------
@@ -107,7 +107,7 @@
     To eneable the project, use the netbeans-freeform plugin for Maven 2.
 
 -------------------
-[maven-user@mini-guide demoquickstart]$ m2 netbeans-freeform:generate-netbeans-project
+[maven-user@mini-guide demoquickstart]$ mvn netbeans-freeform:generate-netbeans-project
 [INFO] Searching repository for plugin with prefix: 'netbeans-freeform'.
 [INFO] ----------------------------------------------------------------------------
 [INFO] Building Maven Quick Start Archetype

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-multiple-repositories.apt Tue Oct 18 21:29:22 2005
@@ -78,7 +78,7 @@
 
 +----+
 
-m2 -Pmyprofile ...
+mvn -Pmyprofile ...
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-releasing.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-releasing.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-releasing.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-releasing.apt Tue Oct 18 21:29:22 2005
@@ -34,7 +34,7 @@
    []
 
 -----
-m2 release:prepare -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm/tags
+mvn release:prepare -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm/tags
 -----
 
  When this operation is over, your source control has the released code tagged and ready to deploy.
@@ -42,7 +42,7 @@
 Performing the release
 
 -----
-m2 release:perform -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm
+mvn release:perform -DtagBase=svn+ssh://svn.codehaus.org/home/projects/plexus/scm
 -----
 
 ~~ -----

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-site.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-site.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-site.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-site.apt Tue Oct 18 21:29:22 2005
@@ -49,7 +49,7 @@
   Generating the site is very simple, and fast!
 
 ---------------
-m2 site:site
+mvn site:site
 ---------------
 
   The resulting site will be in <<<target/site/...>>>
@@ -78,7 +78,7 @@
   You must presently run the <<<site:site>>> goal as well.
 
 ---------------
-m2 site:site site:deploy
+mvn site:site site:deploy
 ---------------
 
   <<Note:>> the trailing slash in the URL above indicates that any subprojects that inherit this value should append their artifact ID to

Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-webapp.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-webapp.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-webapp.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-webapp.apt Tue Oct 18 21:29:22 2005
@@ -8,7 +8,7 @@
 
 +----+
 
-m2 archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-webapp
+mvn archetype:create -DgroupId=com.mycompany.app -DartifactId=my-webapp -DarchetypeArtifactId=maven-archetype-webapp
 
 +----+
 
@@ -39,7 +39,7 @@
 
 +----+
 
-m2 clean:clean package
+mvn clean:clean package
 
 +----+
 

Modified: maven/components/trunk/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/plugin/guide-java-plugin-development.apt Tue Oct 18 21:29:22 2005
@@ -162,7 +162,7 @@
 +----+
 
   For example, to run the simple mojo in the sample plugin, you would enter
-  "<<<m2 sample.plugin:maven-hello-plugin:1.0-SNAPSHOT:sayhi>>>" on the
+  "<<<mvn sample.plugin:maven-hello-plugin:1.0-SNAPSHOT:sayhi>>>" on the
   command line.
 
 *** Shortening the Command Line
@@ -172,7 +172,7 @@
   <<<updateReleaseInfo>>> option set to true; for example:
 
 +----+
-m2 -DupdateReleaseInfo=true install
+mvn -DupdateReleaseInfo=true install
 +----+
 
   You also need to add your plugin's group ID to the list of group IDs
@@ -185,7 +185,7 @@
 </pluginGroups>
 +----+
 
-  At this point, you can run the mojo with "<<<m2 hello:sayhi>>>".
+  At this point, you can run the mojo with "<<<mvn hello:sayhi>>>".
 
 
 *** Attaching the Mojo to the Build Lifecycle

Modified: maven/components/trunk/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/suggestions/non-standard-directories.txt Tue Oct 18 21:29:22 2005
@@ -68,7 +68,7 @@
 3. I ran the install phase as follows:
 
  > cd com/acme
- > m2 install
+ > mvn install
 
 which caused the target directories to be generated also at the same  
 level as each pom - for example com/acme/util/target and com/acme/gui/ 
@@ -90,7 +90,7 @@
 gui.properties
 META-INF/maven/com.acme/gui/pom.properties
 
-which looks fine. I also ran "m2 site:site" as a random goal and that  
+which looks fine. I also ran "mvn site:site" as a random goal and that
 seemed to work too, ie a target/site directory was created with all  
 the files correctly generated underneath.