Author: vsiveton Date: Mon Jan 28 17:07:36 2008 New Revision: 616127 URL: http://svn.apache.org/viewvc?rev=616127&view=rev Log: o fixed some wrong links
Modified: maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt maven/site/trunk/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt maven/site/trunk/src/site/apt/guides/mini/guide-ide-eclipse.apt maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt maven/site/trunk/src/site/apt/guides/mini/guide-repository-ssl.apt maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt maven/site/trunk/src/site/site.xml maven/site/trunk/src/site/xdoc/articles.xml Modified: maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt Mon Jan 28 17:07:36 2008 @@ -28,7 +28,7 @@ Introduction - You need to add your GPG keys in {{https://svn.apache.org/repos/asf/maven/KEYS}} before a release. Here are some + You need to add your GPG keys in {{https://svn.apache.org/repos/asf/maven/project/KEYS}} before a release. Here are some useful {{{http://www.gnupg.org/}GnuPG}} commands to generate your Keys. * gpg --gen-key @@ -155,7 +155,7 @@ You need to append this result to {{https://svn.apache.org/repos/asf/maven/project/KEYS}}. You also need to upload your key to the public server: {{http://pgp.mit.edu/}} - by copying the same you appended in the text field and submit. + by copying the same you appended in the text field and submit. You can ensure by searching your email in key search engine. You can read more about {{{http://www.apache.org/dev/release-signing.html#faq}Checksums And Signatures}}. Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt (original) +++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt Mon Jan 28 17:07:36 2008 @@ -57,7 +57,7 @@ stage in the lifecycle. For example, the default lifecycle has the following build phases (for a complete list of the build phases, refer - to the {{{introduction-to-the-lifecycle#lifecycle_reference}Lifecycle Reference}}): + to the {{{introduction-to-the-lifecycle#Lifecycle_Reference}Lifecycle Reference}}): * <<<validate>>> - validate the project is correct and all necessary information is available @@ -176,7 +176,7 @@ This is an almost standard set of bindings; however, some packages handle them differently. For example, a project that is purely metadata (packaging value is <<<pom>>>) only binds the <<<install>>> and <<<deploy>>> phases (for a complete list of build-phase-to-goal binding of some of the <<<packaging>>>s, refer to the - {{{introduction-to-the-lifecycle#lifecycle_reference}Lifecycle Reference}}). + {{{introduction-to-the-lifecycle#Lifecycle_Reference}Lifecycle Reference}}). Note that for some packaging types to be available, you may also need to include a particular plugin in your <<<build>>> section of your POM (as described in the next section). One example of a plugin that requires this is the Modified: maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt Mon Jan 28 17:07:36 2008 @@ -27,7 +27,7 @@ ~~TODO: versioning doc that discusses this You can specify your user configuration in <<<$\{user.home\}/.m2/settings.xml>>>. A - {{{/maven-settings/settings.html}full reference}} to the configuration file is available. This section will show how + {{{maven-settings/settings.html}full reference}} to the configuration file is available. This section will show how to make some common configurations. Note that the file is not required - defaults will be used if it is not found. * Configuring your Local Repository @@ -78,7 +78,7 @@ <passphrase>my_key_passphrase</passphrase> --> </server> - ... + ... </servers> ... </settings> @@ -113,12 +113,12 @@ <url>http://public.planetmirror.com/maven2/</url> <mirrorOf>central</mirrorOf> </mirror> - ... + ... </mirrors> ... </settings> ------------- - + More info about mirrors is available in the {{{guide-mirror-settings.html}Guide to Mirror Settings}}. * Profiles @@ -126,4 +126,3 @@ Repository configuration can also be put into a profile. You can have multiple profiles, with one set to active so that you can easily switch environments. Read more about profiles in {{{../introduction/introduction-to-profiles.html}Introduction to Build Profiles}}. - \ No newline at end of file Modified: maven/site/trunk/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-coping-with-sun-jars.apt Mon Jan 28 17:07:36 2008 @@ -10,7 +10,7 @@ Often users are confronted with the need to build against JARs provide by SUN like the {{{http://java.sun.com/products/javamail/}JavaMail}} JAR, or the - {{{http://java.sun.com/products/javabeans/glasgow/jaf.html}Activation}} JAR + {{{http://java.sun.com/products/javabeans/jaf/downloads/index.html}Activation}} JAR and users have found these JARs not present in central repository resulting in a broken build. Unfortunately most of these artifacts fall under Sun's Binary License which disallows us from distributing them from Ibiblio. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-ide-eclipse.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-ide-eclipse.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/mini/guide-ide-eclipse.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-ide-eclipse.apt Mon Jan 28 17:07:36 2008 @@ -5,7 +5,7 @@ ------ 28 October 2005 ------ - + Guide to using Eclipse with Maven 2.x This mini guide explains howto use Maven 2 in Eclipse IDE. @@ -26,7 +26,7 @@ +----+ -mvn -Declipse.workspace=<path-to-eclipse-workspace> eclipse:add-maven-repo +mvn -Declipse.workspace=<path-to-eclipse-workspace> eclipse:add-maven-repo +----+ @@ -144,9 +144,9 @@ +----+ <parent> - <groupId>guide.ide.eclipse</groupId> - <artifactId>guide-ide-eclipse</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>guide.ide.eclipse</groupId> + <artifactId>guide-ide-eclipse</artifactId> + <version>1.0-SNAPSHOT</version> </parent> +----+ @@ -209,7 +209,7 @@ <<Issue:>> The maven-eclipse-plugin should optionally generate project dependencies for those modules which are available in the workspace. - + ** {Flat Project Layout} It is possible to move the parent POM in its own directory on the @@ -230,4 +230,4 @@ [] <<Issue:>> The release plugin does not support the flat structure -({{{http://jira.codehaus.org/browse/MNG-1263}MNG-1263}}) +({{{http://jira.codehaus.org/browse/MRELEASE-6}MRELEASE-6}}) 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?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- 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 Mon Jan 28 17:07:36 2008 @@ -98,30 +98,30 @@ +----+ For more details, check out the - {{{/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 - {{{/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 - {{{/guides/introduction/introduction-to-profiles.html}profiles}}. + {{{guides/introduction/introduction-to-profiles.html}profiles}}. * What to do with maven.xml? - See {{/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 - {{/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 - {{{/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. @@ -132,25 +132,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 - {{{/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 {{{/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 - {{{/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 {{{/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-repository-ssl.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-repository-ssl.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/mini/guide-repository-ssl.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-repository-ssl.apt Mon Jan 28 17:07:36 2008 @@ -143,4 +143,4 @@ * {{{http://java.sun.com/j2se/1.4.2/docs/guide/security/} Javasecurity infrastructure (1.4.2)}} - * {{{http://commons.apache.org/httpclient/sslguide.html} HttpClient}}'s SSL guide + * {{{http://hc.apache.org/httpclient-3.x/sslguide.html} HttpClient}}'s SSL guide Modified: maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt (original) +++ maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt Mon Jan 28 17:07:36 2008 @@ -272,7 +272,7 @@ This causes the simple mojo to be executed whenever Java code is compiled. For more information on binding a mojo to phases in the lifecycle, please - refer to the {{{/guides/introduction/introduction-to-the-lifecycle.html}Build Lifecycle}} document. + refer to the {{{guides/introduction/introduction-to-the-lifecycle.html}Build Lifecycle}} document. * Mojo archetype Modified: maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt (original) +++ maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt Mon Jan 28 17:07:36 2008 @@ -3,7 +3,7 @@ ------ Vincent Siveton ------ - October 2006 + January 2008 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -36,9 +36,9 @@ Testing Styles: Unit Testing vs. Functional/Integration Testing A unit test attempts to verify a mojo as an isolated unit, by mocking out the rest of the Maven environment. A mojo unit test does not attempt to run your plugin in the context of a real Maven build. Unit tests are designed to be fast. - + A functional/integration test attempts to use a mojo in a real Maven build, by launching a real instance of Maven in a real project. Normally this requires you to construct special dummy Maven projects with real POM files. Often this requires you to have already installed your plugin into your local repository so it can be used in a real Maven build. Functional tests run much more slowly than unit tests, but they can catch bugs that you may not catch with unit tests. - + The general wisdom is that your code should be mostly tested with unit tests, but should also have some functional tests. Unit Tests @@ -46,20 +46,20 @@ * Using JUnit alone In principle, you can write a unit test of a plugin Mojo the same way you'd write any other JUnit test case, by writing a class that <<<extends TestCase>>>. - + However, most mojos need more information to work properly. For example, you'll probably need to inject a reference to a MavenProject, so your mojo can query project variables. - + * Using PlexusTestCase Mojo variables are injected using Plexus, and many Mojos are written to take specific advantage of the Plexus container (by executing a lifecycle or having various injected dependencies). If you all you need is Plexus container services, you can write your class with <<<extends PlexusTestCase>>> instead of TestCase. - + With that said, if you need to inject Maven objects into your mojo, you'll probably prefer to use the maven-plugin-testing-harness. * maven-plugin-testing-harness - The {{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-harness/}maven-plugin-testing-harness}} + The {{{https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-testing-harness/}maven-plugin-testing-harness}} is explicitly intended to test the <<<org.apache.maven.reporting.AbstractMavenReport#execute()>>> implementation. In general, you need to include <<<maven-plugin-testing-harness>>> as dependency, and create a *MojoTest (by convention) @@ -114,7 +114,7 @@ * maven-verifier maven-verifier tests are run using JUnit or TestNG, and provide a simple class allowing you to launch Maven and assert on its log file and built artifacts. It also provides a ResourceExtractor, which extracts a Maven project from your src/test/resources directory into a temporary working directory where you can do tricky stuff with it. - + Maven itself uses maven-verifier to run its core integration tests. For more information, please refer to {{{http://docs.codehaus.org/display/MAVEN/Creating+a+Maven+Integration+Test}Creating a Maven Integration Test}}. +-----+ @@ -170,7 +170,7 @@ * again. */ verifier.resetStreams(); - + /* * The verifier also supports beanshell scripts for * verification of more complex scenarios. There are @@ -184,7 +184,7 @@ * maven-invoker-plugin - You can use {{{https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-invoker-plugin/}maven-invoker-plugin}} + You can use {{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin/}maven-invoker-plugin}} to invoke Maven and to provide some BeanShell tests. Tests written in this way don't run under JUnit/TestNG; instead, they're run by Maven itself. +-----+ @@ -227,15 +227,15 @@ * shitty-maven-plugin The {{{http://mojo.codehaus.org/shitty-maven-plugin/}shitty-maven-plugin}} (Super Helpful Integration Testing ThingY) provides a simple way to run integration tests for a project (single module or multi-module). - + shitty-maven-plugin does many of the same things as the maven-invoker-plugin (it supports Groovy tests instead of BeanShell tests), though it has some features that aren't available in maven-invoker-plugin. Notably, it provides some advanced setup steps to automatically install your plugin using a special version name ("TESTING"), so your dummy projects can depend on that version explicitly. * maven-it-plugin <<Note>>: maven-it-plugin is not at 1.0 yet. Use it at your own risk. - The {{{https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-it-plugin/}maven-it-plugin}} is used directly - in the <<<integration-test>>> phase. + The {{{https://svn.apache.org/repos/asf/maven/sandbox/trunk/plugins/maven-it-plugin/}maven-it-plugin}} is used directly + in the <<<integration-test>>> phase. <<Note>>: this it plugin can not be used to test a plugin that is being built for the first time (i.e. with no release). In this case, you could, for instance, defined an it-snapshot of the plugin with <<<maven-install-plugin>>>. @@ -350,9 +350,9 @@ </project> +-----+ -* maven-plugin-test-plugin +* maven-plugin-management-plugin - The {{{https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-plugin-test-plugin/}maven-plugin-test-plugin}} + The {{{https://svn.apache.org/repos/asf/maven/sandbox/trunk/plugins/maven-plugin-management-plugin/}maven-plugin-management-plugin}} is to stage/unstage a plugin into the local repository for pre/post-integration-test. You need to configure the <<<maven-plugin-test-plugin>>> and the <<<maven-surefire-plugin>>>: @@ -394,7 +394,7 @@ ... <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-test-plugin</artifactId> + <artifactId>maven-plugin-management-plugin</artifactId> <version>1.0-SNAPSHOT</version> <executions> <execution> @@ -480,6 +480,6 @@ } +-----+ - <<Note>>: The {{{https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-plugin-management-plugin/}maven-plugin-management-plugin}} + <<Note>>: The {{{https://svn.apache.org/repos/asf/maven/sandbox/trunk/plugins/maven-it-plugin/}maven-plugin-management-plugin}} is similar to <<<maven-plugin-test-plugin>>>. Modified: maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt (original) +++ maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt Mon Jan 28 17:07:36 2008 @@ -3,7 +3,7 @@ ----- Brett Porter ----- - 10 November 2006 + January 2008 ----- NMaven Proposal @@ -45,6 +45,8 @@ * To begin consolidating the codebase and encouraging additional contributors + [] + * Current Status ** Meritocracy and Community @@ -86,7 +88,7 @@ * Plexus Compiler component - {{http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-compiler/plexus-compilers/plexus-compiler-csharp/}} - * Maven Sandbox - {{http://svn.apache.org/viewvc/maven/sandbox/csharp/}} + [] * Source and Intellectual Property Submission Plan @@ -111,6 +113,8 @@ * [EMAIL PROTECTED] + [] + ** Subversion Directory https://svn.apache.org/repos/asf/incubator/nmaven @@ -135,6 +139,8 @@ * Brett Porter (brett AT apache DOT org) - Current Maven committer + [] + * Sponsors ** Champion @@ -143,14 +149,16 @@ * Brett Porter + [] + ** Nominated Mentors * Jason van Zyl * Brett Porter + [] + ** Sponsoring Entity The Apache Maven PMC - - Modified: maven/site/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/site.xml (original) +++ maven/site/trunk/src/site/site.xml Mon Jan 28 17:07:36 2008 @@ -143,7 +143,7 @@ <item name="Index (alphabetical)" href="todo.html" /> --> <item name="External Resources" href="/articles.html" /> - <item name="Wiki" href="http://docs.codehaus.org/display/MAVENUSER/" /> + <item name="Wiki" href="http://docs.codehaus.org/display/MAVENUSER/Home" /> </menu> <menu name="Get Maven Plugins"> Modified: maven/site/trunk/src/site/xdoc/articles.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/articles.xml?rev=616127&r1=616126&r2=616127&view=diff ============================================================================== --- maven/site/trunk/src/site/xdoc/articles.xml (original) +++ maven/site/trunk/src/site/xdoc/articles.xml Mon Jan 28 17:07:36 2008 @@ -48,10 +48,10 @@ <li><strong>Publisher:</strong><a href="http://www.devzuz.com">DevZuz</a></li> <li><strong>Published:</strong>March 2006</li> <li><strong>Authors:</strong> - <a href="http://www.commonjava.org/blogs/john">John Casey</a>, + John Casey, <a href="http://blogs.codehaus.org/people/vmassol/">Vincent Massol</a>, <a href="http://www.devzuz.org/blogs/bporter">Brett Porter</a>, - <a href="http://www.carlossanchez.eu">Carlos Sanchez</a> + <a href="http://www.jroller.com/carlossg/">Carlos Sanchez</a> </li> </ul> </div> @@ -195,7 +195,7 @@ <td>13 March 2006</td> </tr> <tr> - <td><a href="http://www.javaworld.com/javaworld/jw-02-2006/jw-0227-maven_p.html">Get the most out of Maven 2 site generation</a></td> + <td><a href="http://www.javaworld.com/javaworld/jw-02-2006/jw-0227-maven.html">Get the most out of Maven 2 site generation</a></td> <td>JavaWorld</td> <td>John Ferguson Smart</td> <td>27 February 2006</td> @@ -279,7 +279,7 @@ <td>17 March 2004</td> </tr> <tr> - <td><a href="http://www.theserverside.com/articles/article.tss?l=MavenMagic">Maven Magic - a tutorial on Maven and J2EE projects.</a></td> + <td><a href="http://www.theserverside.com/tt/articles/article.tss?l=MavenMagic">Maven Magic - a tutorial on Maven and J2EE projects.</a></td> <td>TheServerSide</td> <td>Srikanth Shenoy</td> <td>November 2003</td>