Index: src/site/site.xml =================================================================== --- src/site/site.xml (revision 1189259) +++ src/site/site.xml (working copy) @@ -44,7 +44,7 @@ - + Index: src/site/apt/guides/index.apt =================================================================== --- src/site/apt/guides/index.apt (revision 1189259) +++ src/site/apt/guides/index.apt (working copy) @@ -161,7 +161,7 @@ * {{{./mini/guide-ide-idea.html}IDEA}} - * {{{./mini/guide-ide-netbeans/guide-ide-netbeans.html}Netbeans 4.0 (4.1 and 5.0)}} + * {{{./mini/guide-ide-netbeans/guide-ide-netbeans.html}NetBeans 4.0 (4.1 and 5.0)}} * {{{./mini/guide-bash-m2-completion.html}Maven 2.x Auto-Completion Using BASH}} Index: src/site/apt/guides/mini/guide-using-toolchains.apt =================================================================== --- src/site/apt/guides/mini/guide-using-toolchains.apt (revision 1189259) +++ src/site/apt/guides/mini/guide-using-toolchains.apt (working copy) @@ -33,7 +33,7 @@ The Maven Toolchains provide a way for plugins to discover what JDK (or other tools) are to be used during the build, without the need to configure them. With toolchains, a project can now be built using a specific version of JDK independent - from the one Maven is running with. (Think how JDK versions can be set in IDEs like Idea, Netbeans and Eclipse) + from the one Maven is running with. (Think how JDK versions can be set in IDEs like Idea, NetBeans and Eclipse) Toolchains would only work in Maven 2.0.9 and higher versions. For more details about it's design and implementation, please see {{{http://cwiki.apache.org/confluence/display/MAVENOLD/Toolchains}Toolchains}}. Index: src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt =================================================================== --- src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt (revision 1189259) +++ src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt (working copy) @@ -1,22 +1,22 @@ ------ - Guide to Using Maven 2 in Netbeans 4.0 (4.1 and 5.0) + Guide to Using Maven 2 in NetBeans 4.0 (4.1 and 5.0) ------ Raphaël Piéroni ------ Mon Aug 9 2005 ------ -Using Maven 2 in Netbeans 4.0 (4.1 and 5.0) +Using Maven 2 in NetBeans 4.0 (4.1 and 5.0) - This mini guide explain by examples how to use Maven 2 in Netbeans IDE. + This mini guide explain by examples how to use Maven 2 in NetBeans IDE. - To use Maven 2 in Netbeans you have to follow these steps: + To use Maven 2 in NetBeans you have to follow these steps: * {{{RetreiveCreate_the_Maven_2_project}Retrieve/Create the Maven 2 project.}} * {{{Launch_Maven_2_in_command_line_using_the_netbeans-freeform_plugin}Launch Maven 2 in command line using the netbeans-freeform plugin.}} - * {{{Open_the_project_with_Netbeans}Open the project with Netbeans.}} + * {{{Open_the_project_with_NetBeans}Open the project with NetBeans.}} * {{{Build_the_project_and_launch_other_Maven_goals}Build the project and launch other Maven goals.}} @@ -101,7 +101,7 @@ * {Launch Maven 2 in command line using the netbeans-freeform plugin} After having retrieved the Maven 2 project, you have to enable the project to - be seen as a Netbeans 4.0, 4.1 or 5.0 project using the Netbeans Freeform project type. + be seen as a NetBeans 4.0, 4.1 or 5.0 project using the NetBeans Freeform project type. To enable the project, use the netbeans-freeform plugin for Maven 2. @@ -130,11 +130,11 @@ The netbeans-freeform plugin creates one directory and three files by reading the Maven 2 project descriptor: - * The <<>> directory holds the Netbeans project descriptor. + * The <<>> directory holds the NetBeans project descriptor. - * The <<<>> file is the Netbeans Freeform project descriptor. + * The <<<>> file is the NetBeans Freeform project descriptor. - * The <<>> holds the Ant calls which execute Maven 2, as Netbeans uses Ant as its build tool. + * The <<>> holds the Ant calls which execute Maven 2, as NetBeans uses Ant as its build tool. * The <<>> files holds the two properties: <<>> which is the absolute path to the Maven 2 local repository and <<>> @@ -142,9 +142,9 @@ -* {Open the project with Netbeans} +* {Open the project with NetBeans} - Now that the Maven 2 project is eneabled for use in Netbeans, open your Netbeans IDE. + Now that the Maven 2 project is eneabled for use in NetBeans, open your NetBeans IDE. Then open the project (Ctrl+Maj+O). Here is the window. @@ -169,13 +169,13 @@ * {Build the project and launch other Maven goals} - It is now time to try the first execution of Maven 2 from within Netbeans. - Try the Netbeans action (F11). + It is now time to try the first execution of Maven 2 from within NetBeans. + Try the NetBeans action (F11). You see the Maven 2 execution of the <<>> lifecycle goal. [Run_Build_Main_Project.png] Run Build Main Project - You can also call the Netbeans action which is mapped to the <<>> Maven2 goal. + You can also call the NetBeans action which is mapped to the <<>> Maven2 goal. [Run_Clean_Main_Project.png] Run Clean Main Project @@ -183,7 +183,7 @@ * {Edit properties of the plugin} - Now you can add some additionnal views in your window in Netbeans. + Now you can add some additionnal views in your window in NetBeans. Like an additionnal goal in the context menu. ------------------- @@ -231,7 +231,7 @@ * {Refresh the project view} - To refresh the Project view in Netbeans accordingly to the new configuration added to the Maven 2 project descriptor. + To refresh the Project view in NetBeans accordingly to the new configuration added to the Maven 2 project descriptor. Just right-clic the project in the Projects window and choose the action. [Refresh_Project.png] Refresh Project @@ -244,7 +244,7 @@ * {Build the Maven 2 site} - You can call The Netbeans action which is mapped to the <<>> Maven 2 goal, + You can call The NetBeans action which is mapped to the <<>> Maven 2 goal, here in the Maven site archetype. [Generate_Site.png] Generate Site Index: src/site/apt/netbeans-module.apt =================================================================== --- src/site/apt/netbeans-module.apt (revision 1189259) +++ src/site/apt/netbeans-module.apt (working copy) @@ -1,23 +1,13 @@ ----- - Maven 2.x Modules for NetBeans + Maven Support for NetBeans ----- - Milos Kleint + Milos Kleint, Jesse Glick ----- - 4 Jan 2009 + 26 Oct 2011 ----- -Maven 2.x Module for NetBeans +Maven Support for NetBeans - The NetBeans integration was for a long time developed at {{http://mevenide.codehaus.org}}, it was moved to netbeans.org and is be part of standard NetBeans distribution since 6.7. -It allows to load any Maven 2 project into NetBeans and start coding immediately. -To get a current feature list along with screenshots, description and hints please refer to the {{{http://wiki.netbeans.org/MavenBestPractices}NetBeans.org wiki}} page. - - -* Binaries and Installation - - The Maven integration is easily accessible in NetBeans 6.0, 6.1 and 6.5 via the Tools/Plugins dialog. In 6.7 and later it's part of the standard installation. -More detailed instructions on installation available (for older versions of NetBeans) at the {{{http://mevenide.codehaus.org/m2-site/mevenide2-netbeans/installation.html}Mevenide site}}. - -* Bugs reports and enhancement requests - - Bug, enhancements and feature requests are to be filed in the NetBeans.org {{{http://www.netbeans.org/issues/enter_bug.cgi?component=maven}issue tracking system}}. + NetBeans includes full Maven support since 6.7, including Maven 3 support in 7.0+. +You can open any Maven project in the IDE and start coding immediately. +For more information see the {{{http://wiki.netbeans.org/Maven}NetBeans.org wiki page}}. Index: src/site/pdf.xml =================================================================== --- src/site/pdf.xml (revision 1189259) +++ src/site/pdf.xml (working copy) @@ -120,7 +120,7 @@ - +