Author: rfscholte Date: Thu Jul 28 20:42:45 2011 New Revision: 1151994 URL: http://svn.apache.org/viewvc?rev=1151994&view=rev Log: Fix MECLIPSE-599: Restore broken link to j2ee-simple.tar.gz on multi-module-projects.html Fixed some other anchor links too Use _ #set( $varline = '') ${varline} _ -construction to work around VELOCITY-743 related issue
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm?rev=1151994&r1=1151993&r2=1151994&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/multi-module-projects.apt.vm Thu Jul 28 20:42:45 2011 @@ -52,7 +52,7 @@ Using maven-eclipse-plugin in multi-modu * The Example project This project is an example of a multi-module projects, containing some JAR-, a - WAR- and an EAR-project. You can download it from {{{j2ee-simple.tar.gz}here}}. + WAR- and an EAR-project. You can download it from {{{./j2ee-simple.tar.gz}here}}. The project is based on the j2ee-simple archetype. ** Step by step @@ -67,7 +67,7 @@ Using maven-eclipse-plugin in multi-modu * start '<<<mvn eclipse:eclipse install>>>' from the command-line in the root project (j2ee-simple) - * use the {{Multi Project Import/Export Plugin}} to import all the modules into Eclipse + * use the {{{Multi_Project_Import_Export_Plugin}Multi Project Import/Export Plugin}} to import all the modules into Eclipse * define your favorite application server in the WTP Server view @@ -109,7 +109,7 @@ target also be included in the SCM system, so that any updates (be it a new version or a configuration.change) are received by all developers. -* {Multi Project Import/Export Plugin} +* Multi Project Import/Export Plugin There is an Eclipe plugin available that can help a lot when using multi-module projects. This plugin can import several projects at once, and it can do so from @@ -175,7 +175,7 @@ target * Location: +--- - ${env_var:JAVA_HOME}/bin/java +#set($varline = '${env_var:JAVA_HOME}/bin/java') ${varline} +--- If you're on Windows, you should add the '.exe' extension to the above command. @@ -186,7 +186,7 @@ target be changed into +--- - ${env_var:JAVA_HOME}/bin/${JAVA_EXECUTABLE} +#set($varline = '${env_var:JAVA_HOME}/bin/${JAVA_EXECUTABLE}') ${varline} +--- * Working Directory: @@ -194,7 +194,7 @@ target Select the root pom project here. +--- - ${workspace_loc:/j2ee-simple} +#set($varline = '${workspace_loc:/j2ee-simple}') ${varline} +--- * Arguments: @@ -203,13 +203,13 @@ target the Maven distribution. The project is called 'organization'. +--- - -Dclassworlds.conf=${resource_loc:organization/maven-2.0/bin/m2.conf} - -Dmaven.home=${resource_loc:organization/maven-2.0} - -classpath ${resource_loc:organization/maven-2.0/core/boot/classworlds-1.1.jar} +#set($varline = '-Dclassworlds.conf=${resource_loc:organization/maven-2.0/bin/m2.conf}') ${varline} +#set($varline = '-Dmaven.home=${resource_loc:organization/maven-2.0}') ${varline} +#set($varline = '-classpath ${resource_loc:organization/maven-2.0/core/boot/classworlds-1.1.jar}') ${varline} org.codehaus.classworlds.Launcher -DdownloadSources=true - -Dmaven.test.skip=${string_prompt:maven.test.skip:false} +#set($varline = '-Dmaven.test.skip=${string_prompt:maven.test.skip:false}') ${varline} clean eclipse:clean eclipse:eclipse install +--- @@ -282,16 +282,16 @@ target The configuration of the maven-eclipse-plugin used in this description is: +----- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> <version>${project.version}</version> - <configuration> - <projectNameTemplate>[artifactId]-[version]</projectNameTemplate> - <wtpmanifest>true</wtpmanifest> - <wtpapplicationxml>true</wtpapplicationxml> - <wtpversion>2.0</wtpversion> - <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest> - </configuration> - </plugin> + <configuration> + <projectNameTemplate>[artifactId]-[version]</projectNameTemplate> + <wtpmanifest>true</wtpmanifest> + <wtpapplicationxml>true</wtpapplicationxml> + <wtpversion>2.0</wtpversion> + <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest> + </configuration> + </plugin> +----- Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt?rev=1151994&r1=1151993&r2=1151994&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/usage.apt Thu Jul 28 20:42:45 2011 @@ -30,19 +30,19 @@ Maven Eclipse Plugin: Usage This mini guide explains howto use Maven in Eclipse IDE. - * {{{#Maven repository}Maven repository}} + * {{{Maven_repository}Maven repository}} - * {{{#Maven as an external tool}Maven as an external tool}} + * {{{Maven_as_an_external_tool}Maven as an external tool}} - * {{{#Simple Project}Simple Project}} + * {{{Simple_Project}Simple Project}} - * {{{#Project with Dependencies}Project with Dependencies}} + * {{{Project_with_Dependencies}Project with Dependencies}} - * {{{#Multiple Module Projects}Multiple Module Projects}} + * {{{Multiple_Module_Projects}Multiple Module Projects}} - * {{{#Eclipse PDE Projects}Eclipse PDE Projects}} + * {{{Eclipse_PDE_Projects}Eclipse PDE Projects}} -* {Maven repository} +* Maven repository Eclipse needs to know the path to the local maven repository. Therefore the classpath variable <M2_REPO> has to be set. Execute the following command: @@ -55,7 +55,7 @@ mvn -Declipse.workspace=<path-to-eclipse bar, select Window > Preferences. Select the Java > Build Path > Classpath Variables page. -* {Maven as an external tool} +* Maven as an external tool You might want to execute some maven goals from inside Eclipse. This is possible by configuring an external launcher. @@ -76,7 +76,7 @@ mvn -Declipse.workspace=<path-to-eclipse For further information please refer to the Eclipse help. -* {Simple Project} +* Simple Project If you have a simple java project which is made up of only one module, using Eclipse is very simple. To generate the Eclipse project files from your POM @@ -93,7 +93,7 @@ mvn eclipse:eclipse should not be located in your workspace, because Eclipse might come into trouble, especially if you want to use Eclipse as the scm client. -* {Project with Dependencies} +* Project with Dependencies If your maven project has dependencies, the eclipse classpath will be synchronised with the current list of maven dependencies, as well as @@ -103,7 +103,7 @@ mvn eclipse:eclipse rerun <eclipse:eclipse> and refresh your eclipse workspace for the new dependencies to take effect. -* {Multiple Module Projects} +* Multiple Module Projects If your maven project consists of a number of aggregated projects with a common root pom, and if some of these aggregated projects depend on @@ -116,7 +116,7 @@ mvn eclipse:eclipse For further details, see {{{./reactor.html}Multiple Module Projects}}. -* {Eclipse PDE Projects} +* Eclipse PDE Projects This plugin is capable of creating and / or synchronising an Eclipse Plugin Development Environment project.