svn commit: r610316 - /maven/sandbox/trunk/doxia/doxia-module-xwiki/

2008-01-09 Thread vmassol
Author: vmassol
Date: Wed Jan  9 01:30:34 2008
New Revision: 610316

URL: http://svn.apache.org/viewvc?rev=610316&view=rev
Log:
DOXIA-199, DOXIA-200 (Sink and Parser implementations for XWiki)

* Removed code committed by error in the main tree. I wanted to commit them in 
the sandbox, sorry.

Added:
maven/sandbox/trunk/doxia/doxia-module-xwiki/
  - copied from r610313, 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xwiki/



svn commit: r610490 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 10:11:58 2008
New Revision: 610490

URL: http://svn.apache.org/viewvc?rev=610490&view=rev
Log:
o reflect the goals on the doc

Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt

Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt?rev=610490&r1=610489&r2=610490&view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt Wed Jan  9 
10:11:58 2008
@@ -3,7 +3,7 @@
  --
  Maria Odea Ching
  --
- 13 July 2006
+ January 2008
  --
 
  ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -34,14 +34,16 @@
 
 * Goals Overview
 
-   The Site Plugin has six goals:
+   The Site Plugin has seven goals:
 
* {{{deploy-mojo.html}site:deploy}} is used to deploy the generated site 
using <<>> or <<>> protocol to the site
  specified in the <<<\>>> section of the pom.
 
* {{{attach-descriptor-mojo.html}site:attach-descriptor}} adds the site 
descriptor to the list of files to be
- installed/deployed. For more references of the site descriptor, 
+ installed/deployed. For more references of the site descriptor,
  {{{examples/sitedescriptor.html}here's a link}}.
+
+   * {{{site-jar.html}site:jar}} is used to bundle the site output into a jar.
 
* {{{site-mojo.html}site:site}} is used generate a site for the project.
 




svn commit: r610491 - /maven/site/trunk/src/site/apt/plugins/index.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 10:15:33 2008
New Revision: 610491

URL: http://svn.apache.org/viewvc?rev=610491&view=rev
Log:
o added SCM and JIRA links for plugins
o fixed table header

Modified:
maven/site/trunk/src/site/apt/plugins/index.apt

Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=610491&r1=610490&r2=610491&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Jan  9 10:15:33 2008
@@ -4,7 +4,7 @@
  Brett Porter
  Jason van Zyl
  -
- 04 December 2007
+ January 2008
  -
 
 Available Plugins
@@ -18,134 +18,134 @@
 
   ~~ TODO: the repository manager should be able to produce a page like this. 
Ensure all descriptions are in the POM of these plugins.
 
-*---++--+
-| <>| <> | 
<>
-*---*+--+
-| <> | | 
-*---++--+
-| {{{/plugins/maven-clean-plugin/} <<>>}}| 2.2| Clean 
up after the build.
-*---++--+
-| {{{/plugins/maven-compiler-plugin/} <<>>}}  | 2.0.2  | 
Compiles Java sources.
-*---++--+
-| {{{/plugins/maven-deploy-plugin/} <<>>}}  | 2.3| Deploy 
the built artifact to the remote repository.
-*---++--+
-| {{{/plugins/maven-install-plugin/} <<>>}}| 2.2| Install 
the built artifact into the local repository.
-*---++--+
-| {{{/plugins/maven-resources-plugin/} <<>>}}| 2.2| Copy 
the resources to the output directory for including in the JAR.
-*---++--+
-| {{{/plugins/maven-site-plugin/} <<>>}}  | 2.0-beta-6 | 
Generate a site for the current project.
-*---++--+
-| {{{/plugins/maven-surefire-plugin/} <<>>}}  | 2.3| Run the 
Junit tests in an isolated classloader.
-*---++--+
-| {{{/plugins/maven-verifier-plugin/} <<>>}}  | 1.0-beta-1 | 
Useful for integration tests - verifies the existence of certain conditions.
-*---*+--+
-| <> | | 
-*---++--+
-| {{{/plugins/maven-ear-plugin/} <<>>}}| 2.3.1  | 
Generate an EAR from the current project.
-*---++--+
-| {{{/plugins/maven-ejb-plugin/} <<>>}}| 2.1| Build 
an EJB (and optional client) from the current project.
-*---++--+
-| {{{/plugins/maven-jar-plugin/} <<>>}}| 2.1| Build a 
JAR from the current project.
-*---++--+
-| {{{/plugins/maven-rar-plugin/} <<>>}}| 2.2| Build a 
RAR from the current project.
-*---++--+
-| {{{/plugins/maven-war-plugin/} <<>>}}| 2.1-alpha-1  | 
Build a WAR from the current project.
-*---*+--+
-| <> | | 
-*---+---+--+
-| {{{/plugins/maven-changelog-plugin/} <<>>}}| 2.1| 
Generate a list of recent changes from your SCM.
-*---+---+--+
-| {{{/plugins/maven-changes-plugin/} <<>>}}| 2.0-beta-3 | 
Generate a report from issue tracking or a chan

svn commit: r610492 - in /maven/site/trunk: pom.xml src/site/apt/download.apt.vm

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 10:19:02 2008
New Revision: 610492

URL: http://svn.apache.org/viewvc?rev=610492&view=rev
Log:
MNG-2170: Packaged Maven Documentation for Download

o generate artifact for site
o added link on the download page

Modified:
maven/site/trunk/pom.xml
maven/site/trunk/src/site/apt/download.apt.vm

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=610492&r1=610491&r2=610492&view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Wed Jan  9 10:19:02 2008
@@ -57,6 +57,18 @@
 org.apache.maven.plugins
 maven-site-plugin
 2.0-beta-6
+
+  
+jar
+site
+
+  jar
+
+
+  
${project.reporting.outputDirectory}
+
+  
+
   
 
   

Modified: maven/site/trunk/src/site/apt/download.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/download.apt.vm?rev=610492&r1=610491&r2=610492&view=diff
==
--- maven/site/trunk/src/site/apt/download.apt.vm (original)
+++ maven/site/trunk/src/site/apt/download.apt.vm Wed Jan  9 10:19:02 2008
@@ -4,7 +4,7 @@
 Brett Porter
 Jason van Zyl
  --
-4 October 2005
+January 2008
  --
 
 Download Maven ${currentVersion}
@@ -29,6 +29,8 @@
 *-+-+--+---+
 | Maven Ant Tasks 2.0.8 | 
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-ant-tasks-2.0.8.jar}
 maven-ant-tasks-2.0.8.jar}} | 
{{{http://www.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.8.jar.md5} 
maven-ant-tasks-2.0.8.jar.md5}} | 
{{{http://www.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.8.jar.asc} 
maven-ant-tasks-2.0.8.jar.asc}} |
 *-+-+--+---+
+
+  You could also download the current documentation, i.e. this website, as a 
{{{./maven-site-1.0-site.jar}single jar}} file.
 
 * Previous Releases
 




svn commit: r610493 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 10:22:01 2008
New Revision: 610493

URL: http://svn.apache.org/viewvc?rev=610493&view=rev
Log:
o fixed link

Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt

Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=610493&r1=610492&r2=610493&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Wed Jan  9 
10:22:01 2008
@@ -79,7 +79,7 @@
 +-+
 
  <> Be sure that the generated artifacts respect the
- {{{http://www.apache.org/dev/release.html}Apache release rules}}: NOTICE and 
LICENSE files should be present in
+ {{{http://www.apache.org/dev/release.html#distribute-raw-artifact}Apache 
release rules}}: NOTICE and LICENSE files should be present in
  the META-INF directory within the jar. For -sources artifacts, be sure that 
your pom does NOT use the
  maven-source-plugin:2.0.3 which is broken. The recommended version at this 
time is 2.0.4.
 
@@ -165,7 +165,7 @@
 
  <> Be sure to generate and deploy the site using the same version of 
the release. Typically, you need to check out the tag (or go to 
<<>>)
   and call <<>>.
- 
+
  []
 
  After that you can continue with step 8 in the




svn commit: r610495 - /maven/site/trunk/src/site/apt/plugins/index.apt

2008-01-09 Thread dennisl
Author: dennisl
Date: Wed Jan  9 10:34:09 2008
New Revision: 610495

URL: http://svn.apache.org/viewvc?rev=610495&view=rev
Log:
o Fix JIRA link to maven-surefire-report-plugin.

Modified:
maven/site/trunk/src/site/apt/plugins/index.apt

Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=610495&r1=610494&r2=610495&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Jan  9 10:34:09 2008
@@ -73,7 +73,7 @@
 
*---+--+--+++
 | {{{/plugins/maven-project-info-reports-plugin/} <<>>}} 
| 2.0.1 | Generate standard project reports. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MPIR}JIRA}}
 
*---+--+--+++
-| {{{/plugins/maven-surefire-report-plugin/} <<>>}} | 2.3
| Generate a report based on the results of unit tests. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-report-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/MPIR}JIRA}}
+| {{{/plugins/maven-surefire-report-plugin/} <<>>}} | 2.3
| Generate a report based on the results of unit tests. | 
{{{http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-report-plugin}SVN}}
 | {{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
 
*---+--+--+++
 | <> | |  | |
 
*---+--+--+++




svn commit: r610540 - /maven/site/trunk/src/site/apt/pom.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 12:10:25 2008
New Revision: 610540

URL: http://svn.apache.org/viewvc?rev=610540&view=rev
Log:
MNG-2769: Use of POM namespace is confused and confusing in both the code and 
the documentation

o fixed doc as suggested

Modified:
maven/site/trunk/src/site/apt/pom.apt

Modified: maven/site/trunk/src/site/apt/pom.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=610540&r1=610539&r2=610540&view=diff
==
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Wed Jan  9 12:10:25 2008
@@ -3,7 +3,7 @@
  -
  Eric Redmond
  -
- 3 September 2006
+ January 2008
  -
  
 POM Reference
@@ -120,7 +120,10 @@
   contains 4.0.0. That is currently the only supported POM version for Maven 
2, and is always required.
 
 +--+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
 
   
@@ -174,8 +177,12 @@
   <<>> file, where tasks are almost always dependant on the lines 
executed before it.
 
 +--+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
+
   org.codehaus.mojo
   my-project
   1.0
@@ -227,7 +234,10 @@
   <<>>. We could make it into a <<>> by declaring a different 
packaging:
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   ...
   war
   ...
@@ -268,7 +278,10 @@
   allowing your list to focus solely on the dependencies your project requires.
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   ...
   
 
@@ -360,7 +373,10 @@
   wish to use it or its dependencies, then we would add it as an 
<<>>.
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   ...
   
 
@@ -392,8 +408,12 @@
   extra step in making project inheritance explicit to the project object 
model.
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
+
   org.codehaus.mojo
   my-parent
   2.0
@@ -424,14 +444,19 @@
 []
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
+
   
 org.codehaus.mojo
 my-parent
 2.0
 ../my-parent
   
+
   my-project
 
 +-+
@@ -586,11 +611,16 @@
   directories to those projects.
 
 +-+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
+
   org.codehaus.mojo
   my-parent
   2.0
+
   
 my-project
   
@@ -651,7 +681,11 @@
<<>> 
 
 +---+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
+  ...
   
   ...
 
@@ -719,7 +753,10 @@
   to bundle the resource correctly, you would specify resources similar to the 
following:
 
 +--+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   
 ...
 
@@ -778,7 +815,10 @@
 *** {Plugins}
 
 +--+
-
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd";>
   
 ...
 
@@ -838,7 +878,10 @@
   You would get an <<>> like this:
 
 +--

svn commit: r610547 - /maven/site/trunk/src/site/apt/pom.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 12:33:40 2008
New Revision: 610547

URL: http://svn.apache.org/viewvc?rev=610547&view=rev
Log:
o used the snippet for the super pom 2.0.x

Modified:
maven/site/trunk/src/site/apt/pom.apt

Modified: maven/site/trunk/src/site/apt/pom.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=610547&r1=610546&r2=610547&view=diff
==
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Wed Jan  9 12:33:40 2008
@@ -470,119 +470,9 @@
   Similar to the inheritance of objects in object oriented programming, POMs 
that extend
   a parent POM inherit certain values from that parent. Moreover, just as Java 
objects
   ultimately inherit from <<>>, all Project Object Models 
inherit from
-  a base Super POM.
+  a base Super POM. The snippet below is the Super POM for Maven 2.0.x.
 
-+-+
-
-  4.0.0
-  Maven Default Project
-
-  
-
-  central
-  Maven Repository Switchboard
-  default
-  http://repo1.maven.org/maven2
-  
-false
-  
-
-  
-
-  
-
-  central
-  Maven Plugin Repository
-  http://repo1.maven.org/maven2
-  default
-  
-false
-  
-  
-never
-  
-
-  
-
-  
-target
-target/classes
-${artifactId}-${version}
-target/test-classes
-src/main/java
-src/main/scripts
-src/test/java
-
-  
-src/main/resources
-  
-
-
-  
-src/test/resources
-  
-
-  
-
-  
-target/site
-  
-
-  
-
-  release-profile
-  
-
-  performRelease
-  true
-
-  
-
-  
-
-  
-true
-org.apache.maven.plugins
-maven-source-plugin
-
-  
-attach-sources
-
-  jar
-
-  
-
-  
-
-  
-true
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-  
-attach-javadocs
-
-  jar
-
-  
-
-  
-
-  
-true
-org.apache.maven.plugins
-maven-deploy-plugin
-
-  true
-
-  
-
-  
-
-  
-
-
-+-+
+%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml}
 
   You can take a look at how the Super POM affects your Project Object Model 
by creating a
   minimal <<>> and executing on the command line: <<>>




svn commit: r610599 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 14:22:33 2008
New Revision: 610599

URL: http://svn.apache.org/viewvc?rev=610599&view=rev
Log:
o specify Super POM for 2.0.x and 2.1

Modified:

maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt

Modified: 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt?rev=610599&r1=610598&r2=610599&view=diff
==
--- 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt 
(original)
+++ 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-pom.apt 
Wed Jan  9 14:22:33 2008
@@ -60,7 +60,11 @@
 * {Super POM}
 
  The Super POM is Maven's default POM. All POMs extend the Super POM unless 
explicitly set, meaning the configuration specified
- in the Super POM is inherited by the POMs you created for your projects. The 
snippet below is the Super POM.
+ in the Super POM is inherited by the POMs you created for your projects. The 
snippet below is the Super POM for Maven 2.0.x.
+
+%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml}
+
+ The snippet below is the Super POM for Maven 2.1.x.
 
 
%{snippet|id=superpom|url=http://svn.apache.org/repos/asf/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml}
 




svn commit: r610618 - in /maven/components/trunk: maven-core/src/main/aspect/org/apache/maven/errors/ maven-core/src/main/java/org/apache/maven/errors/ maven-core/src/main/java/org/apache/maven/extens

2008-01-09 Thread jdcasey
Author: jdcasey
Date: Wed Jan  9 16:07:48 2008
New Revision: 610618

URL: http://svn.apache.org/viewvc?rev=610618&view=rev
Log:
Adding some unit tests (mostly stubbed out at the moment) to start testing the 
pointcuts used to shunt build errors off to the appropriate error-reporter 
method.

Added:
maven/components/trunk/maven-embedder/src/test/error-reporting-projects/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingProjectModel_IOException/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingProjectModel_IOException/pom.xml/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingProjectModel_XmlPullParserException/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorParsingProjectModel_XmlPullParserException/pom.xml
   (with props)

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidPluginExecutionEnvironment/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/pom.xml
   (with props)

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/maven/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/maven/test/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/maven/test/error/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/maven/test/error/mojoFailure/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/main/java/org/apache/maven/test/error/mojoFailure/App.java
   (with props)

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/maven/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/maven/test/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/maven/test/error/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/maven/test/error/mojoFailure/

maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportProjectMojoFailureException/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
   (with props)
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/

maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
   (with props)

maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/ProjectDebugAspect.aj
Modified:

maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/ExtensionErrorReporterAspect.aj

maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/MavenExecErrorReporterAspect.aj

maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java

maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java

maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner

svn commit: r610620 - /maven/components/trunk/build.xml

2008-01-09 Thread jdcasey
Author: jdcasey
Date: Wed Jan  9 16:17:41 2008
New Revision: 610620

URL: http://svn.apache.org/viewvc?rev=610620&view=rev
Log:
changing maven-plugins version, since 4-SNAPSHOT is no longer available on the 
people.a.o snapshots repo.

Modified:
maven/components/trunk/build.xml

Modified: maven/components/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=610620&r1=610619&r2=610620&view=diff
==
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Wed Jan  9 16:17:41 2008
@@ -121,7 +121,7 @@
 
 
 
-
+
 
 
 




svn commit: r610625 - /maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:15:11 2008
New Revision: 610625

URL: http://svn.apache.org/viewvc?rev=610625&view=rev
Log:
MNG-2954: Docu incomplete: "Guide to uploading artifacts to the Central 
Repository": Jira project not specified, Attachment usage unclear

o fixed as suggested

Modified:

maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt

Modified: 
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt?rev=610625&r1=610624&r2=610625&view=diff
==
--- 
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt 
(original)
+++ 
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt 
Wed Jan  9 17:15:11 2008
@@ -43,6 +43,7 @@
 
  * dependencies
 
+ []
 
  <>: it will identify your project uniquely across all
  projects, so we need to enforce a naming schema. For projects with artifacts 
already uploaded to the Central Repository it can
@@ -57,7 +58,7 @@
 
  Look at 
{{{http://java.sun.com/docs/books/jls/third_edition/html/packages.html#7.7}
  More information about package names}}. Check also the guide about
- {{{guide-naming-conventions.html}Maven naming conventions}}
+ {{{guide-naming-conventions.html}Maven naming conventions}}.
 
  Examples:
 
@@ -65,6 +66,7 @@
 
  * oness.sf.net -> net.sf.oness
 
+ []
 
 * Explanation
 
@@ -78,8 +80,6 @@
  its life time and we are trying create tools to help normal people sort out 
licensing issues. For example, knowing all the licenses
  for a particular graph of artifacts we could have some strategies that would 
identify potential licensing problems.
 
-
-
 * A basic sample:
 
 ++
@@ -116,7 +116,7 @@
   
   
   -->
- 
+
 
 ++
 
@@ -141,7 +141,7 @@
 
  If your project name is <<>> at SourceForge, then <<>>. If 
it's foo at dev.java.net, then <<>>
 
-
+ []
 
 Sync'ing your own repository to the central repository automatically
 
@@ -155,7 +155,7 @@
  
{{{http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/}current
 scripts}},
  open an issue under 
{{{http://jira.codehaus.org/browse/MAVENUPLOAD}MAVENUPLOAD}} and attach the 
script, and we'll add it to the automatically synced repos.
 
- Make sure you <> that matches the groupId 
(see groupId considerations above). Proof means either the server to sync from 
has a name 
+ Make sure you <> that matches the groupId 
(see groupId considerations above). Proof means either the server to sync from 
has a name
  under that domain, your name shows up in a prominent place in the domain, or 
you provide a link to a whois database where your name shows up as the domain 
owner.
 
  If you are using ssh in your own server you need to add the 
{{{http://www.ibiblio.org/maven/id_dsa.pub}maven public key}} to the authorized 
ones to allow us to log
@@ -175,7 +175,7 @@
  issue first describing what and why you are trying to do it, and you may be 
designated the "unofficial" mantainer of the repository section associated to 
that project,
  and you will be responsible of publishing the new releases for that project 
in your repository if other users request it. You can opt out at any time.
 
-
+ []
 
 Manual upload of artifacts
 
@@ -186,7 +186,6 @@
  It means that for each version you release and want to upload to the central 
repository you will have to wait that time. If a problem is detected it will
  be notified in the Jira issue and <> until the next time 
the issues are processed.
 
-
 * Step 1: Create an upload bundle
 
  Use the repository plugin provided with the standard Maven distribution to 
create an upload bundle:
@@ -199,7 +198,7 @@
 
  The bundle will be created in your <<>> directory with the name:
  <<<${pom.artifactId}-${pom.currentVersion}-bundle.jar>>>
- 
+
  If you want to include a jar with java sources in your upload (recommended, 
unless your license doesn't
  allow sources to be redistributed) the command to run is:
 
@@ -236,14 +235,15 @@
 * Step 2: Posting the request
 
  Post your request to 
{{{http://jira.codehaus.org/secure/CreateIssue.jspa?pid=10367&issuetype=3}JIRA}}.
- In the description you must write the URL of the upload bundle
+ Under this URL, you need to choose that the project is 
"maven-upload-requests" and issue type is "wish".
+ In the description, you must write the URL of the upload bundle
  (if you're uploading more than one bundle please add all the urls under the 
same issue),
  then leave a blank line and provide the following:
 
  * a url where the project can be found.
 
  * if you are one of its developers, a url where your name or email can be 
found inside the project site.
- 
+
  []
 
  This will speed up the uploading process.
@@ -276,8 +276,6 @@
 
 ++
 
-
-
 Manual process FAQ and common mistakes
 
  * I use parent poms how do I

svn commit: r610629 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:18:23 2008
New Revision: 610629

URL: http://svn.apache.org/viewvc?rev=610629&view=rev
Log:
MNG-2655: Revise Introduction to the Build Lifecycle

o patch applied

Modified:

maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt

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=610629&r1=610628&r2=610629&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
 Wed Jan  9 17:18:23 2008
@@ -6,17 +6,58 @@
  16 June 2005
  --
 
+ ~~ Copyright 2006 The Apache Software Foundation.
+ ~~
+ ~~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~~ you may not use this file except in compliance with the License.
+ ~~ You may obtain a copy of the License at
+ ~~
+ ~~  http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing, software
+ ~~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~~ See the License for the specific language governing permissions and
+ ~~ limitations under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Introduction to the Build Lifecycle
 
-* Build Lifecycle Basics
+* Table Of Contents
+
+ * {{{introduction-to-the-lifecycle.html#Build_Lifecycle_Basics}Build 
Lifecycle Basics}}
+
+ * 
{{{introduction-to-the-lifecycle.html#Setting_Up_Your_Project_To_Use_The_Build_Lifecycle}Setting
 Up Your Project To Use The Build Lifecycle}}
+
+   * {{{introduction-to-the-lifecycle.html#Packaging}Packaging}}
+
+   * {{{introduction-to-the-lifecycle.html#Plugins}Plugins}}
+
+ * {{{introduction-to-the-lifecycle.html#Lifecycle_Reference}Lifecycle 
Reference}}
+
+ []
+
+* {Build Lifecycle Basics}
 
   Maven 2.0 is based around the central concept of a build lifecycle. What 
this means is that the process for building
-  and distributing a particular artifact is clearly defined.
+  and distributing a particular artifact (project) is clearly defined.
 
   For the person building a project, this means that it is only necessary to 
learn a small set of commands to build any
   Maven project, and the POM will ensure they get the results they desired.
 
-   The most common lifecycle phases that would be executed on a project are 
the following (a complete list of the lifecycle phases is given below):
+  There are three built-in Build Lifecycles: default, clean, and site. The 
default lifecycle handles your project
+  deployment, the clean lifecycle handles project cleaning, while the site 
lifecycle handles the creation of your
+  project's site documentation.
+
+**  {A Build Lifecycle is Made Up of Phases}
+
+  Each of these build lifecycles are defined by a different list of build 
phases, wherein a build phase represents a
+  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}}):
 
 * <<>> - validate the project is correct and all necessary 
information is available
 
@@ -37,18 +78,31 @@
 * <<>> - done in an integration or release environment, copies the 
final package to the remote repository
   for sharing with other developers and projects.
 
-  Note that for each of these steps, all previous steps are always executed, 
so you only need to specify the last one
-  you desire on the command line. For example:
+  These build phases (plus the other build phases not shown here) and executed 
sequentially to complete the default
+  lifecycle. Given the build phases above, this means that when the default 
lifecycle is used, Maven will first validate
+  the project, then will try to compile the sources, run those against the 
tests, packages the binaries (i.e jar), run
+  integration tests against that package, verifies the packaging, install the 
verifed package to the local repository,
+  then depoy the installed package in a specified environment.
+
+  To do all those, you only need to call the last build phase to be executed, 
in this case, deploy.
 
 ---
-mvn install
+mvn deploy
 ---
 
-  This command will compile, test, package, verify and install the package 
into the local repository when run.
+  That is because if you call a build phase, it will execute not only that 
build phase, but also every build phase
+  prior to the called build phase. Thus, doing
+
+---
+mvn integration-test
+---
+
+  Will do ev

svn commit: r610630 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:24:23 2008
New Revision: 610630

URL: http://svn.apache.org/viewvc?rev=610630&view=rev
Log:
MNGSITE-28: Add a link to Artifactory to the "Introduction to Repositories" 
guide

o added some external links

Modified:

maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt

Modified: 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt?rev=610630&r1=610629&r2=610630&view=diff
==
--- 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
 (original)
+++ 
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
 Wed Jan  9 17:24:23 2008
@@ -168,8 +168,8 @@
 
 
 ++
- 
- If your internal repository requires authentication, the <<>> element can 
be used in your {{{../../settings.html#Servers}settings}} file 
+
+ If your internal repository requires authentication, the <<>> element can 
be used in your {{{../../settings.html#Servers}settings}} file
  to specify login information.
 
 * Deploying to the Internal Repository
@@ -177,7 +177,19 @@
  One of the most important reasons to have one or more internal repositories 
is to be able to publish
  your own private releases to share.
 
- To publish to the repository, you will need to have access via one of SCP, 
SFTP, FTP, WebDAV, or the filesystem. Connectivity is accomplished with the 
various 
+ To publish to the repository, you will need to have access via one of SCP, 
SFTP, FTP, WebDAV, or the filesystem. Connectivity is accomplished with the 
various
  {{{http://maven.apache.org/wagon/wagon-providers/index.html}wagons}}. Some 
wagons may need to be added as 
{{{http://maven.apache.org/ref/current/maven-model/maven.html#class_extension}extension}}
 to your build.
 ~~ For example, to set up an SCP transfer.
 ~~ show the scp example.
+
+* External Links
+
+  * {{{http://www.devzuz.org/blogs/oching/2007/11/05/119423340.html}The 
Hype About Repository Managers}}
+
+  * {{{http://maven.apache.org/archiva}Archiva}}
+
+  * {{{http://artifactory.sourceforge.net}Artifactory}}
+
+  * {{{http://www.pdark.de/dsmp/}DSMP (Dead Simple Maven Proxy)}}
+
+  * {{{http://proximity.abstracthorizon.org/}Proximity}}




svn commit: r610631 - /maven/site/trunk/src/site/xdoc/articles.xml

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:25:21 2008
New Revision: 610631

URL: http://svn.apache.org/viewvc?rev=610631&view=rev
Log:
o added articles from The Server Side

Modified:
maven/site/trunk/src/site/xdoc/articles.xml

Modified: maven/site/trunk/src/site/xdoc/articles.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/articles.xml?rev=610631&r1=610630&r2=610631&view=diff
==
--- maven/site/trunk/src/site/xdoc/articles.xml (original)
+++ maven/site/trunk/src/site/xdoc/articles.xml Wed Jan  9 17:25:21 2008
@@ -76,9 +76,9 @@
 
 
   
-If you're interested in testing your Maven skills, check out http://www.javablackbelt.com/QuestionnaireDefDisplay.wwa?questPublicId=01559";>JavaBlackBelt's
 Maven exam. 
+If you're interested in testing your Maven skills, check out http://www.javablackbelt.com/QuestionnaireDefDisplay.wwa?questPublicId=01559";>JavaBlackBelt's
 Maven exam.
 This exam is being written collaboratively by the community. Feel free 
to add new questions, suggest improvements, etc.
-  
+  
 
 
 
@@ -101,6 +101,12 @@
 Anadolu Üniversitesi
 Mustafa Sait Özen
 August 2007
+  
+  
+http://www.theserverside.com/tt/articles/article.tss?l=SettingUpMavenRepository";>Setting
 up the Internal Repository
+The Server Side
+Avneet Mangat
+June 2007
   
   
 http://today.java.net/pub/a/today/2007/03/01/building-web-applications-with-maven-2.html";>Building
 Web Applications with Maven 2




svn commit: r610635 - /maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:36:23 2008
New Revision: 610635

URL: http://svn.apache.org/viewvc?rev=610635&view=rev
Log:
MNGSITE-25: Guide to Mirror Settings - repository size is out of date

o applied

Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt

Modified: maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt?rev=610635&r1=610634&r2=610635&view=diff
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt 
(original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt Wed Jan 
 9 17:36:23 2008
@@ -21,7 +21,7 @@
 * You want to run maven-proxy to provide a local cache to a mirror and 
need to use it's URL instead
 
  To configure a mirror of a given repository, you provide it in your settings 
file ($HOME/.m2/settings.xml),
- giving the new repository its 
+ giving the new repository its
  own <<>> and <<>>, and specify the <<>> setting that is 
the ID of the repository you are using a
  mirror of. For example, the ID of the main Maven repository included by 
default is <<>>, so to use
  the mirror at , you would configure the following:
@@ -100,7 +100,7 @@
   
 
 
- 
+
 
   ibiblio.net
   http://www.ibiblio.net/pub/packages/maven2
@@ -150,7 +150,7 @@
 
 Creating your own mirror
 
-  The central repository requires around 10 GB and growing, and it's updated 
every 4 hours.
+  The central repository requires around 16 GB and growing, and it's updated 
every 4 hours.
 
   You can mirror the central repository using rsync from several mirrors, 
choose one
 




svn commit: r610640 - in /maven/sandbox/trunk/other/m1-m2: ./ maven1+project+to+maven2+pom.xsl

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:49:32 2008
New Revision: 610640

URL: http://svn.apache.org/viewvc?rev=610640&view=rev
Log:
MNG-2337: XSLT for converting Maven1 project.xml to Maven2 pom.xml

o added

Added:
maven/sandbox/trunk/other/m1-m2/
maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl   (with 
props)

Added: maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/other/m1-m2/maven1%2Bproject%2Bto%2Bmaven2%2Bpom.xsl?rev=610640&view=auto
==
--- maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl (added)
+++ maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl Wed Jan  9 
17:49:32 2008
@@ -0,0 +1,104 @@
+
+
+http://www.w3.org/1999/XSL/Transform"; version="1.0"
+xmlns="http://maven.apache.org/POM/4.0.0";
+xmlns:mv2="http://maven.apache.org/POM/4.0.0"; 
exclude-result-prefixes="mv2">
+
+
+
+
+http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+pom.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Propchange: maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl
--
svn:eol-style = native

Propchange: maven/sandbox/trunk/other/m1-m2/maven1+project+to+maven2+pom.xsl
--
svn:keywords = "Author Date Id Revision"




svn commit: r610642 - /maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt

2008-01-09 Thread vsiveton
Author: vsiveton
Date: Wed Jan  9 17:58:42 2008
New Revision: 610642

URL: http://svn.apache.org/viewvc?rev=610642&view=rev
Log:
MNG-1887: Guide to transforming a maven.xml goal into a plugin

o added related links

Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt

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=610642&r1=610641&r2=610642&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 Wed Jan  9 
17:58:42 2008
@@ -1,9 +1,9 @@
  -
  Guide to Moving From Maven 1.x to Maven 2.x
- ---   
+ ---
  Jay H. Hartley
  -
- 12 October 2005
+ January 2008
  -
 
 Guide to Moving from Maven 1.x to Maven 2.x
@@ -18,23 +18,25 @@
  It is possible to establish parallel Maven builds, one using the old M1 
settings,
  and a second using M2. The Maven 2 configuration file names and uses have 
been modified,
  so the two builds should not conflict.
-   
+
  A Maven 1.x build is configured with the following files:
-   
+
  * [project.xml] Project Object Model (POM) definition
-   
+
  * [maven.xml] Custom build scripts
-   
+
  * [project.properties] general build settings
-   
+
  * [build.properties] local build settings
 
  A Maven 2 build is configured with a different file set:
-   
+
  * [pom.xml] POM definition
-   
+
  * [settings.xml] local configuration
-   
+
+ []
+
 * Migrating the POM
 
  The Project Object Model (POM) has moved from the project.xml file to pom.xml.
@@ -47,9 +49,8 @@
  should not cause a problem with an initial build.
 
  project.xml:
-   
-++
 
+++
 
   3
   util
@@ -63,15 +64,13 @@
   
 ...
   
-   ...
+  ...
 
-
 ++
 
  pom.xml:
-   
-++
 
+++
 
   4.0.0
   util
@@ -85,24 +84,23 @@
   
   ...
   
-   ...
+  ...
 
-
 ++
 
  For more details, check out the
  {{{/guides/introduction/introduction-to-the-pom.html}POM Guide}}.
-   
+
 * build.properties and project.properties
 
  These files have been replaced with
  {{{/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}}.
-   
+
 * What to do with maven.xml?
 
  See {{/maven1.html#m1-maven-xml}} for an explanation of
@@ -118,7 +116,7 @@
  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.
-   
+
 * Migrating Plug-ins
 
  The main conceptual change in plugins and their use has to do with the 
concept of
@@ -127,27 +125,26 @@
  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}}
  for more on how plugins relate.
-   
+
 ** Re-use Ant Tasks
 
  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}}.
+  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}}.
 
 ** 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.
-   
-++
 
+++
 
   ...
   
@@ -159,7 +156,6 @@
 
   
 
-
 ++
 
 *** Multiproject Builds
@@ -172,4 +168,10 @@
 * Migrating repositories
 
  Every four hours the Maven 1.x repository is converted over to a Maven 2.x 
repository and we plan to release
- a plug-in based on our conversion tool but currently
\ No newline at end of file
+ a plug-in based on our conversion tool but currently.
+
+* Related links
+
+ * {{{http://maven.apache.org/plugins/maven-one-plugin}Maven 2 One Plugin}}
+
+ *

svn propchange: r610640 - svn:log

2008-01-09 Thread vsiveton
Author: vsiveton
Revision: 610640
Modified property: svn:log

Modified: svn:log at Wed Jan  9 18:06:52 2008
--
--- svn:log (original)
+++ svn:log Wed Jan  9 18:06:52 2008
@@ -1,3 +1,4 @@
 MNG-2337: XSLT for converting Maven1 project.xml to Maven2 pom.xml
+Submitted by: David Smiley
 
 o added