svn commit: r1419257 - /maven/site/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Dec 10 08:14:00 2012
New Revision: 1419257

URL: http://svn.apache.org/viewvc?rev=1419257&view=rev
Log:
make site output directory configurable tru cli

Modified:
maven/site/trunk/pom.xml

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1419257&r1=1419256&r2=1419257&view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Mon Dec 10 08:14:00 2012
@@ -69,6 +69,7 @@
 
2.2.1,2.2.0,2.1.0,2.0.11,2.0.10,2.0.9,2.0.8,2.0.7,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,2.0
 
3.0.4,3.0.3,3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3
 
scp://people.apache.org/www/maven.apache.org/
+${project.build.directory}/site
   
 
   
@@ -177,6 +178,7 @@
 
   
 true
+${site.output}
 
   
 org.apache.maven.plugins

svn commit: r1419268 - /maven/site/trunk/content/apt/developers/publish-website.apt

[olamy]

Author: olamy
Date: Mon Dec 10 08:50:53 2012
New Revision: 1419268

URL: http://svn.apache.org/viewvc?rev=1419268&view=rev
Log:
start documentation of using asf cmd

Added:
maven/site/trunk/content/apt/developers/publish-website.apt
  - copied unchanged from r1419256, 
maven/site/trunk/content/apt/developers/index.apt

svn commit: r1419269 - /maven/site/trunk/content/apt/developers/publish-website.apt

[olamy]

Author: olamy
Date: Mon Dec 10 08:52:31 2012
New Revision: 1419269

URL: http://svn.apache.org/viewvc?rev=1419269&view=rev
Log:
cleanup copied file

Modified:
maven/site/trunk/content/apt/developers/publish-website.apt

Modified: maven/site/trunk/content/apt/developers/publish-website.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/publish-website.apt?rev=1419269&r1=1419268&r2=1419269&view=diff
==
--- maven/site/trunk/content/apt/developers/publish-website.apt (original)
+++ maven/site/trunk/content/apt/developers/publish-website.apt Mon Dec 10 
08:52:31 2012
@@ -1,10 +1,9 @@
  --
- Maven Developer Centre
+ Web site with Apache CMS
  --
- Vincent Siveton
- Brett Porter
+ Olivier Lamy
  --
- 2008-07-03
+ 2012-12-10
  --
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -27,93 +26,6 @@
 ~~ NOTE: For help with the syntax of this file, see:
 ~~ http://maven.apache.org/doxia/references/apt-format.html
 
-Maven Developer Centre
+How to publish website with Apache CMS
 
-  This documentation centre is for people who are Maven developers, or would 
like to contribute.
-
-  If you cannot find your answers here, feel free to ask the 
{{{mailto:d...@maven.apache.org}Maven Developer List}}.
-
-* Contributors Resources
-
-  * {{{../guides/development/guide-helping.html}Guide to helping with Maven}}
-
-  * {{{../guides/development/guide-m2-development.html}Developing Maven}}
-
-  * {{{../plugin-developers/common-bugs.html} Common Bugs and Pitfalls}}
-
-  * {{{../guides/development/guide-building-m2.html}Building Maven}}
-
-  * {{{../continuous-integration.html}Continuous Integration}}
-
-  * {{{../source-repository.html}Source Repository}}
-
-  []
-
-* Committers Resources
-
-** General Resources
-
-  * {{{./welcome-to-new-committers.html}Guide for new Maven committers}}
-
-  * {{{./committer-environment.html}Committer Environment}}
-
-  * {{{./committer-settings.html}Committer Settings}}
-
-  * {{{./java5.html}Java 5 in Plugins and Components}}
-
-  * {{{./retirement-plan-plugins.html}Retirement Plan for Plugins}}
-
-  * {{{./dependency-policies.html}Maven Dependency Policies}}
-
-  []
-
-* Developers Conventions
-
-  There are a number of conventions used in the Maven projects, which 
contributors and developers alike should follow for
-  consistency's sake.
-
-  * {{{./conventions/code.html}Maven Code Style And Conventions}}
-
-  * {{{./conventions/jira.html}Maven JIRA Convention}}
-
-  * {{{./conventions/svn.html}Maven SVN Convention}}
-
-  * {{{./conventions/git.html}Maven Git Convention}}
-
-  []
-
- <>: If you cannot find your answers here, feel free to ask the 
{{{mailto:d...@maven.apache.org}Maven Developer List}}.
-
-* Making Releases
-
-  * {{{./release/pmc-gpg-keys.html}Making GPG Keys}}
-
-  * {{{./release/releasing.html}Release Process}}
-
-  []
-
-* Maven Website
-
-  * {{{./website/deploy-maven-website.html}Deploy Maven Website}}
-  
-  * {{{./website/deploy-maven-current-ref.html}Deploy Maven Current 
References}}
-
-  []
-
-* Others Resources
-
-  * {{{http://people.apache.org/~vgritsenko/stats/projects/maven.html}Maven 
Web Stats}}
-
-  * {{{http://people.apache.org/~coar/mlists.html#maven.apache.org}Maven 
Mailing List Stats}}
-
-  * {{{http://www.apache.org/dev/}ASF Development Infrastructure Information}}
-
-  * {{{http://www.apache.org/foundation/}About the Apache Software Foundation}}
-
-  []
-
-~~TODO: tasks as buttons?
-
-~~TODO: de-dupe with existing documents in community
-
-~~TODO: clean up, have cookbook with more in depth documents like cutting 
releases, etc.
+  
\ No newline at end of file

svn commit: r841373 - in /websites/staging/maven/trunk/content: ./ developers/publish-website.html maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 08:54:35 2012
New Revision: 841373

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/developers/publish-website.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 08:54:35 2012
@@ -1 +1 @@
-1419268
+1419269

Modified: websites/staging/maven/trunk/content/developers/publish-website.html
==
--- websites/staging/maven/trunk/content/developers/publish-website.html 
(original)
+++ websites/staging/maven/trunk/content/developers/publish-website.html Mon 
Dec 10 08:54:35 2012
@@ -5,16 +5,15 @@
 -->
 http://www.w3.org/1999/xhtml";>
   
-Maven - Maven Developer Centre
+Maven - Web site with Apache CMS
 
   @import url("../css/maven-base.css");
   @import url("../css/maven-theme.css");
   @import url("../css/site.css");
 
 
-
-
+
+
 
 
 
@@ -42,7 +41,7 @@ Brett Porter" />
 >
   Maven
 >
-Maven Developer Centre
+Web site with Apache CMS
 
 
 Last Published: 2012-12-10
@@ -230,7 +229,7 @@ Brett Porter" />
 
 
   
-Maven Developer CentreThis documentation centre is for 
people who are Maven developers, or would like to contribute.If you 
cannot find your answers here, feel free to ask the mailto:d...@maven.apache.org";>Maven Developer List.Contributors ResourcesGuide to helping with 
MavenDeveloping 
Maven Common Bugs 
and PitfallsBuilding 
MavenContinuous 
IntegrationSource 
RepositoryCommitter
 s ResourcesGeneral ResourcesGuide for new Maven 
committersCommitter 
EnvironmentCommitter 
SettingsJava 5 in Plugins and 
ComponentsRetirement Plan 
for PluginsMaven Dependency 
PoliciesDevelopers 
ConventionsThere are a number of 
conventions used in the Maven projects, which contributors and developers alike 
should follow for consistency's sake.Maven Code Style And ConventionsMaven JIRA ConventionMaven SVN ConventionMaven Git ConventionNote: 
If you cannot find your answers here, feel free to ask the mailto:d...@maven.apache.org";>Maven Developer 
List.Making ReleasesMaking GPG KeysRelease ProcessMaven WebsiteDeploy Maven WebsiteDeploy Maven Current 
ReferencesOthers Resourceshttp://people.apache.org/~vgritsenko/stats/projects/maven.html";>Maven Web 
Stats
 http://people.apache.org/~coar/mlists.html#maven.apache.org";>Maven 
Mailing List Statshttp://www.apache.org/dev/";>ASF Development Infrastructure 
Informationhttp://www.apache.org/foundation/";>About the Apache Software 
Foundation
+How to publish website with 
Apache CMS
   
 
 

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==
Binary files - no diff available.

svn commit: r841395 - /websites/production/maven/content/

[joes]

Author: joes
Date: Mon Dec 10 12:52:29 2012
New Revision: 841395

Log:
prep for copy from maventest

Removed:
websites/production/maven/content/

svn commit: r841397 - /websites/production/maven/content/

[joes]

Author: joes
Date: Mon Dec 10 12:55:30 2012
New Revision: 841397

Log:
copy from maventest

Added:
websites/production/maven/content/
  - copied from r841396, websites/maven/

svn commit: r1419416 - in /maven/doxia/site: pom.xml src/ trunk/ trunk/pom.xml trunk/src/

[olamy]

Author: olamy
Date: Mon Dec 10 13:13:16 2012
New Revision: 1419416

URL: http://svn.apache.org/viewvc?rev=1419416&view=rev
Log:
use a compliant cms tree

Added:
maven/doxia/site/trunk/
maven/doxia/site/trunk/pom.xml
  - copied unchanged from r1419414, maven/doxia/site/pom.xml
maven/doxia/site/trunk/src/
  - copied from r1419414, maven/doxia/site/src/
Removed:
maven/doxia/site/pom.xml
maven/doxia/site/src/

svn commit: r1419421 - /maven/doxia/trunks/

[olamy]

Author: olamy
Date: Mon Dec 10 13:16:24 2012
New Revision: 1419421

URL: http://svn.apache.org/viewvc?rev=1419421&view=rev
Log:
fix externals

Modified:
maven/doxia/trunks/   (props changed)

Propchange: maven/doxia/trunks/
--
--- svn:externals (original)
+++ svn:externals Mon Dec 10 13:16:24 2012
@@ -2,4 +2,4 @@ doxia https://svn.apache.org/repos/asf/m
 doxia-ide https://svn.apache.org/repos/asf/maven/doxia/doxia-ide/trunk
 doxia-sitetools 
https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk
 doxia-tools https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk
-site https://svn.apache.org/repos/asf/maven/doxia/site/
+site https://svn.apache.org/repos/asf/maven/doxia/site/trunk

svn commit: r1419422 - /maven/doxia/doxia-tools/trunk/doxia-tools/

[olamy]

Author: olamy
Date: Mon Dec 10 13:16:55 2012
New Revision: 1419422

URL: http://svn.apache.org/viewvc?rev=1419422&view=rev
Log:
svn:ignore

Modified:
maven/doxia/doxia-tools/trunk/doxia-tools/   (props changed)

Propchange: maven/doxia/doxia-tools/trunk/doxia-tools/
--
--- svn:ignore (original)
+++ svn:ignore Mon Dec 10 13:16:55 2012
@@ -1 +1,3 @@
 target
+*.iml
+

svn commit: r1419426 - /maven/doxia/site/trunk/

[olamy]

Author: olamy
Date: Mon Dec 10 13:17:35 2012
New Revision: 1419426

URL: http://svn.apache.org/viewvc?rev=1419426&view=rev
Log:
svn:ignore

Modified:
maven/doxia/site/trunk/   (props changed)

Propchange: maven/doxia/site/trunk/
--
--- svn:ignore (added)
+++ svn:ignore Mon Dec 10 13:17:35 2012
@@ -0,0 +1,2 @@
+target
+*.iml

svn commit: r1419432 - /maven/doxia/site/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Dec 10 13:21:33 2012
New Revision: 1419432

URL: http://svn.apache.org/viewvc?rev=1419432&view=rev
Log:
use cms compatible tree

Modified:
maven/doxia/site/trunk/pom.xml

Modified: maven/doxia/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/pom.xml?rev=1419432&r1=1419431&r2=1419432&view=diff
==
--- maven/doxia/site/trunk/pom.xml (original)
+++ maven/doxia/site/trunk/pom.xml Mon Dec 10 13:21:33 2012
@@ -197,11 +197,22 @@ under the License.
   org.apache.maven.plugins
   maven-site-plugin
   3.2
+  
+${basedir}/content
+  
+  
+
+  org.apache.maven.doxia
+  doxia-module-markdown
+  1.3
+
+  
 
 
   org.apache.maven.plugins
   maven-pdf-plugin
   1.2-SNAPSHOT
+
 
   
 

svn commit: r1419433 - in /maven/doxia/site/trunk: content/ content/books/ src/books/ src/site/

[olamy]

Author: olamy
Date: Mon Dec 10 13:22:31 2012
New Revision: 1419433

URL: http://svn.apache.org/viewvc?rev=1419433&view=rev
Log:
compatible cms tree

Added:
maven/doxia/site/trunk/content/
  - copied from r1419419, maven/doxia/site/trunk/src/site/
maven/doxia/site/trunk/content/books/
  - copied from r1419419, maven/doxia/site/trunk/src/books/
Removed:
maven/doxia/site/trunk/src/books/
maven/doxia/site/trunk/src/site/

svn commit: r1419437 - in /maven/doxia/site/trunk: content/apt/book/index.apt pom.xml

[olamy]

Author: olamy
Date: Mon Dec 10 13:27:11 2012
New Revision: 1419437

URL: http://svn.apache.org/viewvc?rev=1419437&view=rev
Log:
fix site build

Modified:
maven/doxia/site/trunk/content/apt/book/index.apt
maven/doxia/site/trunk/pom.xml

Modified: maven/doxia/site/trunk/content/apt/book/index.apt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/apt/book/index.apt?rev=1419437&r1=1419436&r2=1419437&view=diff
==
--- maven/doxia/site/trunk/content/apt/book/index.apt (original)
+++ maven/doxia/site/trunk/content/apt/book/index.apt Mon Dec 10 13:27:11 2012
@@ -51,7 +51,7 @@ Introduction
 
  A sample is given below:
 
-%{snippet|id=example|file=src/books/example-book.xml}
+%{snippet|id=example|file=content/books/example-book.xml}
 
 * Configuring Doxia Book Maven Plugin
 

Modified: maven/doxia/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/pom.xml?rev=1419437&r1=1419436&r2=1419437&view=diff
==
--- maven/doxia/site/trunk/pom.xml (original)
+++ maven/doxia/site/trunk/pom.xml Mon Dec 10 13:27:11 2012
@@ -211,7 +211,7 @@ under the License.
 
   org.apache.maven.plugins
   maven-pdf-plugin
-  1.2-SNAPSHOT
+  1.2
 
 
   
@@ -234,8 +234,8 @@ under the License.
 
   
 
-  src/books/example-book
-  src/books/example-book.xml
+  content/books/example-book
+  content/books/example-book.xml
   
 
   latex
@@ -295,6 +295,8 @@ under the License.
 
 
   
${project.reporting.outputDirectory}
+  ${basedir}/content
+  ${basedir}/content/pdf.xml
 
   
 

svn commit: r1419445 - /maven/doxia/site/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Dec 10 13:32:12 2012
New Revision: 1419445

URL: http://svn.apache.org/viewvc?rev=1419445&view=rev
Log:
test last maven parent snapshot

Modified:
maven/doxia/site/trunk/pom.xml

Modified: maven/doxia/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/pom.xml?rev=1419445&r1=1419444&r2=1419445&view=diff
==
--- maven/doxia/site/trunk/pom.xml (original)
+++ maven/doxia/site/trunk/pom.xml Mon Dec 10 13:32:12 2012
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven-parent
-22
+23-SNAPSHOT
 ../../pom/maven/pom.xml
   
 

svn commit: r1419457 - /maven/doxia/site/trunk/pom.xml

[joes]

Author: joes
Date: Mon Dec 10 13:46:11 2012
New Revision: 1419457

URL: http://svn.apache.org/viewvc?rev=1419457&view=rev
Log:
trivial change to generate site build

Modified:
maven/doxia/site/trunk/pom.xml

Modified: maven/doxia/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/pom.xml?rev=1419457&r1=1419456&r2=1419457&view=diff
==
--- maven/doxia/site/trunk/pom.xml (original)
+++ maven/doxia/site/trunk/pom.xml Mon Dec 10 13:46:11 2012
@@ -1,5 +1,4 @@
 
-
 
-
 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/xsd/maven-4.0.0.xsd";>
   4.0.0
 

svn commit: r1419478 - /maven/doxia/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 14:10:38 2012
New Revision: 1419478

URL: http://svn.apache.org/viewvc?rev=1419478&view=rev
Log:
fix comments/documentation

Modified:
maven/doxia/site/trunk/content/resources/extpaths.txt

Modified: maven/doxia/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/resources/extpaths.txt?rev=1419478&r1=1419477&r2=1419478&view=diff
==
--- maven/doxia/site/trunk/content/resources/extpaths.txt (original)
+++ maven/doxia/site/trunk/content/resources/extpaths.txt Mon Dec 10 14:10:38 
2012
@@ -1,2 +1,2 @@
-# extpaths for doxia
-# another build test!
\ No newline at end of file
+# directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
+# space indentation = directories not yet committed to svn production tree

svn commit: r1419485 - /maven/doxia/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 14:17:07 2012
New Revision: 1419485

URL: http://svn.apache.org/viewvc?rev=1419485&view=rev
Log:
doxia folder imported

Modified:
maven/doxia/site/trunk/content/resources/extpaths.txt

Modified: maven/doxia/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/resources/extpaths.txt?rev=1419485&r1=1419484&r2=1419485&view=diff
==
--- maven/doxia/site/trunk/content/resources/extpaths.txt (original)
+++ maven/doxia/site/trunk/content/resources/extpaths.txt Mon Dec 10 14:17:07 
2012
@@ -1,2 +1,3 @@
 # directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
 # space indentation = directories not yet committed to svn production tree
+doxia
\ No newline at end of file

svn commit: r841419 - in /websites/production/maven-doxia/content/doxia: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/doxia/ apidocs/org/apache/maven

[olamy]

Author: olamy
Date: Mon Dec 10 15:12:36 2012
New Revision: 841419

Log:
import doxia content


[This commit notification would consist of 1105 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1419540 - /maven/doxia/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 15:59:05 2012
New Revision: 1419540

URL: http://svn.apache.org/viewvc?rev=1419540&view=rev
Log:
doxia-sitetools last version content imported.

Modified:
maven/doxia/site/trunk/content/resources/extpaths.txt

Modified: maven/doxia/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/resources/extpaths.txt?rev=1419540&r1=1419539&r2=1419540&view=diff
==
--- maven/doxia/site/trunk/content/resources/extpaths.txt (original)
+++ maven/doxia/site/trunk/content/resources/extpaths.txt Mon Dec 10 15:59:05 
2012
@@ -1,3 +1,4 @@
 # directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
 # space indentation = directories not yet committed to svn production tree
-doxia
\ No newline at end of file
+doxia
+doxia-sitetools
\ No newline at end of file

svn commit: r841433 - in /websites/staging/maven-doxia/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 15:59:10 2012
New Revision: 841433

Log:
Staging update by buildbot for maven-doxia

Modified:
websites/staging/maven-doxia/trunk/content/   (props changed)
websites/staging/maven-doxia/trunk/content/extpaths.txt

Propchange: websites/staging/maven-doxia/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 15:59:10 2012
@@ -1 +1 @@
-1419485
+1419540

Modified: websites/staging/maven-doxia/trunk/content/extpaths.txt
==
--- websites/staging/maven-doxia/trunk/content/extpaths.txt (original)
+++ websites/staging/maven-doxia/trunk/content/extpaths.txt Mon Dec 10 15:59:10 
2012
@@ -1,3 +1,4 @@
 # directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
 # space indentation = directories not yet committed to svn production tree
-doxia
\ No newline at end of file
+doxia
+doxia-sitetools
\ No newline at end of file

svn commit: r841432 - in /websites/production/maven-doxia/content/doxia-sitetools: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/doxia/ apidocs/org/ap

[olamy]

Author: olamy
Date: Mon Dec 10 15:55:34 2012
New Revision: 841432

Log:
import doxia-sitetools content


[This commit notification would consist of 190 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r841436 - in /websites/production/maven-doxia/content: ./ doxia-sitetools/ doxia/

[olamy]

Author: olamy
Date: Mon Dec 10 16:01:04 2012
New Revision: 841436

Log:
Publishing svnmucc operation to maven-doxia site by olamy

Added:
websites/production/maven-doxia/content/
  - copied from r841435, websites/staging/maven-doxia/trunk/content/
websites/production/maven-doxia/content/doxia/
  - copied from r841435, websites/production/maven-doxia/content/doxia/
websites/production/maven-doxia/content/doxia-sitetools/
  - copied from r841435, 
websites/production/maven-doxia/content/doxia-sitetools/

svn commit: r1419550 - /maven/doxia/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 16:12:08 2012
New Revision: 1419550

URL: http://svn.apache.org/viewvc?rev=1419550&view=rev
Log:
doxia-1.2 content imported.

Modified:
maven/doxia/site/trunk/content/resources/extpaths.txt

Modified: maven/doxia/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/resources/extpaths.txt?rev=1419550&r1=1419549&r2=1419550&view=diff
==
--- maven/doxia/site/trunk/content/resources/extpaths.txt (original)
+++ maven/doxia/site/trunk/content/resources/extpaths.txt Mon Dec 10 16:12:08 
2012
@@ -1,4 +1,5 @@
 # directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
 # space indentation = directories not yet committed to svn production tree
 doxia
-doxia-sitetools
\ No newline at end of file
+doxia-sitetools
+doxia-1.2
\ No newline at end of file

svn commit: r841441 - in /websites/staging/maven-doxia/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 16:12:14 2012
New Revision: 841441

Log:
Staging update by buildbot for maven-doxia

Modified:
websites/staging/maven-doxia/trunk/content/   (props changed)
websites/staging/maven-doxia/trunk/content/extpaths.txt

Propchange: websites/staging/maven-doxia/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 16:12:14 2012
@@ -1 +1 @@
-1419540
+1419550

Modified: websites/staging/maven-doxia/trunk/content/extpaths.txt
==
--- websites/staging/maven-doxia/trunk/content/extpaths.txt (original)
+++ websites/staging/maven-doxia/trunk/content/extpaths.txt Mon Dec 10 16:12:14 
2012
@@ -1,4 +1,5 @@
 # directories in /www/maven.apache.org/doxia but not in any svn tree: dtd, 
project, xsd
 # space indentation = directories not yet committed to svn production tree
 doxia
-doxia-sitetools
\ No newline at end of file
+doxia-sitetools
+doxia-1.2
\ No newline at end of file

svn commit: r1419556 - /maven/site/trunk/content/apt/developers/dependency-policies.apt

[olamy]

Author: olamy
Date: Mon Dec 10 16:17:58 2012
New Revision: 1419556

URL: http://svn.apache.org/viewvc?rev=1419556&view=rev
Log:
adapt due to git move.

Modified:
maven/site/trunk/content/apt/developers/dependency-policies.apt

Modified: maven/site/trunk/content/apt/developers/dependency-policies.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/dependency-policies.apt?rev=1419556&r1=1419555&r2=1419556&view=diff
==
--- maven/site/trunk/content/apt/developers/dependency-policies.apt (original)
+++ maven/site/trunk/content/apt/developers/dependency-policies.apt Mon Dec 10 
16:17:58 2012
@@ -42,6 +42,7 @@ Maven Dependency Policies
   not have a Subversion URL starting with 
   <<>> then this page does not apply
   to you.
+  Or git repositories starting with: 
https://git-wip-us.apache.org/repos/asf/maven*
 
 * Background
 
@@ -74,4 +75,4 @@ Maven Dependency Policies
 
 * Non-Core Dependencies
 
-  Non-Core components may only use Category A or Category B licenses.
+  Non-Core components may only use Category A or Category B licenses.
\ No newline at end of file

svn commit: r841444 - in /websites/staging/maven/trunk/content: ./ developers/dependency-policies.html maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 16:19:47 2012
New Revision: 841444

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/developers/dependency-policies.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 16:19:47 2012
@@ -1 +1 @@
-1419269
+1419557

Modified: 
websites/staging/maven/trunk/content/developers/dependency-policies.html
==
--- websites/staging/maven/trunk/content/developers/dependency-policies.html 
(original)
+++ websites/staging/maven/trunk/content/developers/dependency-policies.html 
Mon Dec 10 16:19:47 2012
@@ -229,7 +229,7 @@
 
 
   
-Maven Dependency PoliciesScopeThis page describes the policies around the use of 
dependencies by the Apache Maven Developers in the process of developing Apache 
Maven itself.This page does not apply to projects hosted outside of the 
Apache Maven project. In order to remove all doubt, this page only applies to 
code which has a Subversion URL that starts with 
https://svn.apache.org/repo/asf/maven/If you have stumbled 
across this page and you are working on code that does not have a Subversion 
URL starting with https://svn.apache.org/repo/asf/maven/ then this 
page does not apply to you.BackgroundThe Apache Maven PMC is tasked with ensuring 
(among other things) that all legal issues are addressed and that each and 
every release is the pr
 oduct of the community as a whole.The Apache Maven project consists of 
quite a number of components. For the purposes of this policy, we will make a 
distinction between the core Maven distribution and all the other 
components.The core Maven distribution is the binary and source 
distributions made available from the http://maven.apache.org/download page. 
ApplicabilityThis policy applies to all changes to 
dependencies as and from Subversion revision 1067464.Core Maven Distribution DependenciesAll dependencies which 
are included in the Core Maven Distribution must either:be licensed 
under a http://www.apache.org/legal/resolved.html#category-a";>Category A 
license; orbe licensed under a http://www.apache.org/legal/resolv
 ed.html#category-b">Category B license and approved by a majority vote of 
the Apache Maven PMC.Votes for Category B licenses will be held on 
the d...@maven.apache.org mailing list. A majority of the PMC must vote in 
favour of a Category B licensed dependency before a release can be made 
containing that dependency.Non-Core 
DependenciesNon-Core components may 
only use Category A or Category B licenses.
+Maven Dependency PoliciesScopeThis page describes the policies around the use of 
dependencies by the Apache Maven Developers in the process of developing Apache 
Maven itself.This page does not apply to projects hosted outside of the 
Apache Maven project. In order to remove all doubt, this page only applies to 
code which has a Subversion URL that starts with 
https://svn.apache.org/repo/asf/maven/If you have stumbled 
across this page and you are working on code that does not have a Subversion 
URL starting with https://svn.apache.org/repo/asf/maven/ then this 
page does not apply to you. Or git repositories starting with: 
https://git-wip-us.apache.org/repos/asf/maven*BackgroundThe Apache Maven 
PMC is tasked with ensuring (among other thi
 ngs) that all legal issues are addressed and that each and every release is 
the product of the community as a whole.The Apache Maven project 
consists of quite a number of components. For the purposes of this policy, we 
will make a distinction between the core Maven distribution and all the other 
components.The core Maven distribution is the binary and source 
distributions made available from the http://maven.apache.org/download page. 
ApplicabilityThis policy applies to all changes to 
dependencies as and from Subversion revision 1067464.Core Maven Distribution DependenciesAll dependencies which 
are included in the Core Maven Distribution must either:be licensed 
under a http://www.apache.org/legal/resolved.html#category-a";>Category A 
license; orbe
  licensed under a http://www.apache.org/legal/resolved.html#category-b";>Category B 
license and approved by a majority vote of the Apache Maven 
PMC.Votes for Category B licenses will be held on the 
d...@maven.apache.org mailing list. A majority of the PMC must vote in favour 
of a Category B licensed dependency before a release can be made containing 
that dependency.Non-Core DependenciesNon-Core components may only use 
Category A or Category B licenses.
   
 
 

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar

svn commit: r1419581 - /maven/doxia/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 16:56:29 2012
New Revision: 1419581

URL: http://svn.apache.org/viewvc?rev=1419581&view=rev
Log:
doxia-sitetools-1.2 content imported

Modified:
maven/doxia/site/trunk/content/resources/extpaths.txt

Modified: maven/doxia/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/resources/extpaths.txt?rev=1419581&r1=1419580&r2=1419581&view=diff
==
--- maven/doxia/site/trunk/content/resources/extpaths.txt (original)
+++ maven/doxia/site/trunk/content/resources/extpaths.txt Mon Dec 10 16:56:29 
2012
@@ -2,4 +2,5 @@
 # space indentation = directories not yet committed to svn production tree
 doxia
 doxia-sitetools
-doxia-1.2
\ No newline at end of file
+doxia-1.2
+doxia-sitetools-1.2
\ No newline at end of file

svn commit: r841450 - in /websites/staging/maven-doxia/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 16:56:38 2012
New Revision: 841450

Log:
Staging update by buildbot for maven-doxia

Modified:
websites/staging/maven-doxia/trunk/content/   (props changed)
websites/staging/maven-doxia/trunk/content/extpaths.txt

Propchange: websites/staging/maven-doxia/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 16:56:38 2012
@@ -1 +1 @@
-1419550
+1419581

Modified: websites/staging/maven-doxia/trunk/content/extpaths.txt
==
--- websites/staging/maven-doxia/trunk/content/extpaths.txt (original)
+++ websites/staging/maven-doxia/trunk/content/extpaths.txt Mon Dec 10 16:56:38 
2012
@@ -2,4 +2,5 @@
 # space indentation = directories not yet committed to svn production tree
 doxia
 doxia-sitetools
-doxia-1.2
\ No newline at end of file
+doxia-1.2
+doxia-sitetools-1.2
\ No newline at end of file

svn commit: r841449 - in /websites/production/maven-doxia/content/doxia-1.2: ./ css/ doxia-book/ doxia-book/apidocs/ doxia-book/apidocs/org/ doxia-book/apidocs/org/apache/ doxia-book/apidocs/org/apach

[olamy]

Author: olamy
Date: Mon Dec 10 16:45:46 2012
New Revision: 841449

Log:
import doxia 1.2 content


[This commit notification would consist of 567 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1419584 - /maven/doxia/site/trunk/content/site.xml

[olamy]

Author: olamy
Date: Mon Dec 10 17:05:46 2012
New Revision: 1419584

URL: http://svn.apache.org/viewvc?rev=1419584&view=rev
Log:
comment links to 1.1 and 1.0 we already have 1.3 and 1.2

Modified:
maven/doxia/site/trunk/content/site.xml

Modified: maven/doxia/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/site.xml?rev=1419584&r1=1419583&r2=1419584&view=diff
==
--- maven/doxia/site/trunk/content/site.xml (original)
+++ maven/doxia/site/trunk/content/site.xml Mon Dec 10 17:05:46 2012
@@ -82,14 +82,14 @@ under the License.
 
 
   
-  
+  
   
   
 

svn commit: r841453 - in /websites/production/maven-doxia/content/doxia-sitetools-1.2: ./ css/ doxia-decoration-model/ doxia-decoration-model/apidocs/ doxia-decoration-model/apidocs/org/ doxia-decorat

[olamy]

Author: olamy
Date: Mon Dec 10 17:22:11 2012
New Revision: 841453

Log:
import doxia-sitetools 1.2 content


[This commit notification would consist of 112 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r841454 - in /websites/production/maven-doxia/content: ./ doxia-1.2/ doxia-sitetools-1.2/ doxia-sitetools/ doxia/

[olamy]

Author: olamy
Date: Mon Dec 10 17:24:33 2012
New Revision: 841454

Log:
Publishing svnmucc operation to maven-doxia site by olamy

Added:
websites/production/maven-doxia/content/
  - copied from r841452, websites/staging/maven-doxia/trunk/content/
websites/production/maven-doxia/content/doxia/
  - copied from r841453, websites/production/maven-doxia/content/doxia/
websites/production/maven-doxia/content/doxia-1.2/
  - copied from r841453, websites/production/maven-doxia/content/doxia-1.2/
websites/production/maven-doxia/content/doxia-sitetools/
  - copied from r841453, 
websites/production/maven-doxia/content/doxia-sitetools/
websites/production/maven-doxia/content/doxia-sitetools-1.2/
  - copied from r841453, 
websites/production/maven-doxia/content/doxia-sitetools-1.2/

svn commit: r841457 - in /websites/staging/maven/trunk/content: ./ images/ images/books/ images/logos/

[buildbot]

Author: buildbot
Date: Mon Dec 10 17:40:33 2012
New Revision: 841457

Log:
Staging update by buildbot for maven

Added:
websites/staging/maven/trunk/content/images/add.gif   (with props)
websites/staging/maven/trunk/content/images/apache-maven-project-blue.png   
(with props)
websites/staging/maven/trunk/content/images/apache-maven-project.jpg   
(with props)
websites/staging/maven/trunk/content/images/apache-maven-project.png   
(with props)
websites/staging/maven/trunk/content/images/apache-maven.png   (with props)
websites/staging/maven/trunk/content/images/asf_logo_wide_clear.gif   (with 
props)

websites/staging/maven/trunk/content/images/books/pearson_apache_maven_fr.jpg   
(with props)
websites/staging/maven/trunk/content/images/close.gif   (with props)
websites/staging/maven/trunk/content/images/collapsed.png   (with props)
websites/staging/maven/trunk/content/images/expanded.png   (with props)
websites/staging/maven/trunk/content/images/external-classic.png   (with 
props)
websites/staging/maven/trunk/content/images/favicon.ico   (with props)
websites/staging/maven/trunk/content/images/file.gif   (with props)
websites/staging/maven/trunk/content/images/fix.gif   (with props)
websites/staging/maven/trunk/content/images/folder-closed.gif   (with props)
websites/staging/maven/trunk/content/images/h3.gif   (with props)
websites/staging/maven/trunk/content/images/help_logo.gif   (with props)
websites/staging/maven/trunk/content/images/icon_alert.gif   (with props)
websites/staging/maven/trunk/content/images/icon_alertsml.gif   (with props)
websites/staging/maven/trunk/content/images/icon_arrowfolder1_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowfolder2_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowfolderclosed1_sml.gif 
  (with props)
websites/staging/maven/trunk/content/images/icon_arrowfolderopen2_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowmembers1_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowmembers2_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowusergroups1_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowusergroups2_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowwaste1_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_arrowwaste2_sml.gif   
(with props)
websites/staging/maven/trunk/content/images/icon_confirmsml.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_doc_lrg.gif   (with props)
websites/staging/maven/trunk/content/images/icon_doc_sml.gif   (with props)
websites/staging/maven/trunk/content/images/icon_error_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_folder_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_folder_sml.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_help_lrg.gif   (with props)
websites/staging/maven/trunk/content/images/icon_help_sml.gif   (with props)
websites/staging/maven/trunk/content/images/icon_info_lrg.gif   (with props)
websites/staging/maven/trunk/content/images/icon_infosml.gif   (with props)
websites/staging/maven/trunk/content/images/icon_members_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_members_sml.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_sortdown.gif   (with props)
websites/staging/maven/trunk/content/images/icon_sortleft.gif   (with props)
websites/staging/maven/trunk/content/images/icon_sortright.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_sortup.gif   (with props)
websites/staging/maven/trunk/content/images/icon_success_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_usergroups_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_usergroups_sml.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_warning_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_waste_lrg.gif   (with 
props)
websites/staging/maven/trunk/content/images/icon_waste_sml.gif   (with 
props)
websites/staging/maven/trunk/content/images/jakarta-logo-blue.gif   (with 
props)
websites/staging/maven/trunk/content/images/jakarta-logo-blue.png   (with 
props)
websites/staging/maven/trunk/content/images/logos/maven-bolt.png   (with 
props)
websites/staging/maven/trunk/content/images/logos/maven-brewed.png   (with 
props)

websites/staging/maven/trunk/content/images/logos/maven-build-successfull.png   
(with props)
websites/staging/maven/trunk/content/images/logos/maven-built.png   (with 
props)
websites/staging/maven/trunk/content/images/logos/maven-bulldozer.png   
(with

git commit: o Added extraArtifacts, removed souts, simplified getInitalGoals

[krosenvold]

Updated Branches:
  refs/heads/master 0cb28a6de -> 065da9ca6


 o Added extraArtifacts, removed souts, simplified getInitalGoals

I know this is 3 things at once, but it does not seem impossible after all


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/065da9ca
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/065da9ca
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/065da9ca

Branch: refs/heads/master
Commit: 065da9ca635cf23747da25164da872c3f1ef1a3c
Parents: 0cb28a6
Author: Kristian Rosenvold 
Authored: Mon Dec 10 19:37:31 2012 +0100
Committer: Kristian Rosenvold 
Committed: Mon Dec 10 19:37:31 2012 +0100

--
 .../surefire/its/fixture/SurefireLauncher.java |   77 +++
 .../its/jiras/Surefire740TruncatedCommaIT.java |1 -
 .../its/jiras/Surefire772BothReportsIT.java|6 -
 .../its/jiras/Surefire772NoSurefireReportsIT.java  |8 --
 .../its/jiras/Surefire772SpecifiedReportsIT.java   |6 -
 .../src/test/resources/working-directory/pom.xml   |3 +-
 surefire-setup-integration-tests/pom.xml   |   54 ++-
 7 files changed, 90 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/065da9ca/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 0e4cedb..ed44849 100755
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -48,14 +48,14 @@ public class SurefireLauncher
 {
 private final List cliOptions = new ArrayList();
 
-private final List goals = getInitialGoals();
-
-private final Map envvars = new HashMap();
-
 private final String testNgVersion = System.getProperty( "testng.version" 
);
 
 private final String surefireVersion = System.getProperty( 
"surefire.version" );
 
+private final List goals = getInitialGoals( testNgVersion );
+
+private final Map envvars = new HashMap();
+
 private Verifier verifier;
 
 private OutputValidator validator;
@@ -76,8 +76,8 @@ public class SurefireLauncher
 this.resourceName = resourceName;
 this.suffix = suffix != null ? suffix : "";
 goals.clear();
-goals.addAll( getInitialGoals() );
-cliOptions.clear();
+goals.addAll( getInitialGoals( testNgVersion ) );
+resetCliOptions();
 }
 
 public SurefireLauncher( Verifier verifier )
@@ -87,8 +87,13 @@ public class SurefireLauncher
 this.suffix = "";
 this.verifier = verifier;
 goals.clear();
-goals.addAll( getInitialGoals() );
-cliOptions.clear();
+goals.addAll( getInitialGoals( testNgVersion ) );
+resetCliOptions();
+}
+
+private void addCliOption( String cliOption )
+{
+cliOptions.add( cliOption );
 }
 
 private Verifier createVerifier( Class testClass, String resourceName )
@@ -122,7 +127,7 @@ public class SurefireLauncher
 {
 // dirty. Im sure we can use junit4 rules to attach testname to thread 
instead
 StackTraceElement[] stackTrace = getStackTraceElements();
-StackTraceElement topInTestClass = null;
+StackTraceElement topInTestClass;
 topInTestClass = findTopElemenent( stackTrace, testClass );
 if ( topInTestClass == null )
 {
@@ -164,8 +169,14 @@ public class SurefireLauncher
 public void reset()
 {
 goals.clear();
-goals.addAll( getInitialGoals() );
+goals.addAll( getInitialGoals( testNgVersion ) );
+resetCliOptions();
+}
+
+private void resetCliOptions()
+{
 cliOptions.clear();
+offline();
 }
 
 public SurefireLauncher getSubProjectLauncher( String subProject )
@@ -188,16 +199,16 @@ public class SurefireLauncher
 return this;
 }
 
-private List getInitialGoals()
+private List getInitialGoals( String testNgVersion1 )
 {
 List goals1 = new ArrayList();
 goals1.add( "-Dsurefire.version=" + surefireVersion );
 
 if ( testNgVersion != null )
 {
-goals1.add( "-DtestNgVersion=" + testNgVersion );
+goals1.add( "-DtestNgVersion=" + testNgVersion1 );
 
-ArtifactVersion v = new DefaultArtifactVersion( testNgVersion );
+ArtifactVersion v = new DefaultArtifactVersion(

git commit: o Removed NPE on odd configuration

[krosenvold]

Updated Branches:
  refs/heads/master 065da9ca6 -> 90edbd4ab


o Removed NPE on odd configuration


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/90edbd4a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/90edbd4a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/90edbd4a

Branch: refs/heads/master
Commit: 90edbd4abd3697c92692a2d12f15aaf02e66af40
Parents: 065da9c
Author: Kristian Rosenvold 
Authored: Mon Dec 10 19:38:29 2012 +0100
Committer: Kristian Rosenvold 
Committed: Mon Dec 10 19:38:29 2012 +0100

--
 .../surefire/report/DefaultReporterFactory.java|5 +
 1 files changed, 1 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/90edbd4a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 55784ff..52d925e 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -43,8 +43,6 @@ public class DefaultReporterFactory
 
 private final RunStatistics globalStats = new RunStatistics();
 
-private final ConsoleReporter multicastingReporter;
-
 private final StartupReportConfiguration reportConfiguration;
 
 private final StatisticsReporter statisticsReporter;
@@ -55,7 +53,6 @@ public class DefaultReporterFactory
 public DefaultReporterFactory( StartupReportConfiguration 
reportConfiguration )
 {
 this.reportConfiguration = reportConfiguration;
-multicastingReporter = 
reportConfiguration.instantiateConsoleReporter();
 this.statisticsReporter = 
reportConfiguration.instantiateStatisticsReporter();
 runStarting();
 }
@@ -106,7 +103,7 @@ public class DefaultReporterFactory
 logger.info( "" );
 if ( globalStats.hadFailures() )
 {
-multicastingReporter.writeMessage( "Failed tests: " );
+logger.info( "Failed tests: " );
 for ( Object o : this.globalStats.getFailureSources() )
 {
 logger.info( "  " + o );

git commit: o IT project for new failure display

[krosenvold]

Updated Branches:
  refs/heads/master 25fb9fd4f -> 06801079f


o IT project for new failure display


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/06801079
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/06801079
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/06801079

Branch: refs/heads/master
Commit: 06801079f2d609debc7b22dbc4b997e1dd8bca4f
Parents: 25fb9fd
Author: Kristian Rosenvold 
Authored: Mon Dec 10 14:51:01 2012 +0100
Committer: Kristian Rosenvold 
Committed: Mon Dec 10 19:40:22 2012 +0100

--
 .../src/test/resources/failureOutput/pom.xml   |   56 ++
 .../src/test/java/forkConsoleOutput/Test1.java |   85 +++
 .../src/test/java/forkConsoleOutput/Test2.java |   35 ++
 .../src/test/resources/failureOutput/test  |   15 +++
 4 files changed, 191 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06801079/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
--
diff --git 
a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml 
b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
new file mode 100644
index 000..5be8fc4
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
@@ -0,0 +1,56 @@
+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.apache.maven.plugins.surefire
+  failureOutput
+  jar
+  1.0-SNAPSHOT
+  failureOutput
+  http://maven.apache.org
+
+  
+  
+  junit
+  junit
+  ${junit.version}
+  
+  
+  
+ 
+
+   org.apache.maven.plugins
+   maven-compiler-plugin
+   
+  1.5
+  1.5
+   
+
+
+   org.apache.maven.plugins
+   maven-surefire-plugin
+   ${surefire.version}
+   
+ ${forkMode}
+ ${printSummary}
+ ${userFile}
+ ${reportFormat}
+  
${redirect.to.file}
+ 
+**/Test*.java
+ 
+   
+
+ 
+
+  
+
+
+  4.8.1
+  true
+  once
+  true
+  true
+  brief
+
+
+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/06801079/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
--
diff --git 
a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
 
b/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
new file mode 100644
index 000..af92952
--- /dev/null
+++ 
b/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
@@ -0,0 +1,85 @@
+package forkConsoleOutput;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+
+public class Test1
+{
+@Test
+public void test6281() {
+System.out.println( "Test1 on" + Thread.currentThread().getName());
+}
+
+@Test
+public void nullPointerInLibrary() {
+new File((String)null);
+}
+
+@Test
+public void failInMethod() {
+innerFailure();
+}
+
+@Test
+public void failInLibInMethod() {
+new File((String)null);
+}
+
+
+@Test
+public void failInNestedLibInMethod() {
+nestedLibFailure();
+}
+
+@Test
+public void assertion1() {
+Assert.assertEquals("Bending maths", "123", "312");
+}
+
+@Test
+public void assertion2() {
+Assert.assertFalse("

git commit: [SUREFIRE-934] remove getLocatedClasses() and size() from TestsToRun

[krosenvold]

Updated Branches:
  refs/heads/master 06801079f -> f35f1efb5


[SUREFIRE-934] remove getLocatedClasses() and size() from TestsToRun

..,  to avoid potential programming errors with forkMode=onceperthread


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f35f1efb
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f35f1efb
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f35f1efb

Branch: refs/heads/master
Commit: f35f1efb55696b0202ff042d5d1058c5c5b3cc73
Parents: 0680107
Author: agudian 
Authored: Sun Dec 9 23:17:53 2012 +0100
Committer: Kristian Rosenvold 
Committed: Mon Dec 10 19:41:09 2012 +0100

--
 .../surefire/util/DefaultRunOrderCalculator.java   |9 -
 .../apache/maven/surefire/util/LazyTestsToRun.java |   19 -
 .../org/apache/maven/surefire/util/TestsToRun.java |   10 -
 .../apache/maven/surefire/util/TestsToRunTest.java |   12 +++--
 .../surefire/testng/TestNGDirectoryTestSuite.java  |   30 ++
 5 files changed, 36 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f35f1efb/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
index 52ad510..b1950c4 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import org.apache.maven.plugin.surefire.runorder.RunEntryStatisticsMap;
 import org.apache.maven.surefire.testset.RunOrderParameters;
@@ -54,7 +55,13 @@ public class DefaultRunOrderCalculator
 
 public TestsToRun orderTestClasses( TestsToRun scannedClasses )
 {
-List result = new ArrayList( Arrays.asList( 
scannedClasses.getLocatedClasses() ) );
+
+List result = new ArrayList( 500 );
+
+for ( Iterator it = scannedClasses.iterator(); it.hasNext(); )
+{
+result.add(it.next());
+}
 
 orderTestClasses( result, runOrder.length != 0 ? runOrder[0] : null );
 return new TestsToRun( result );

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f35f1efb/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
index 874c971..3a6dba7 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/LazyTestsToRun.java
@@ -36,9 +36,6 @@ import org.apache.maven.surefire.booter.ForkingRunListener;
  * {@link #iterator()} returns an Iterator that blocks on calls to
  * {@link Iterator#hasNext()} until new classes are available, or no more
  * classes will be available.
- * 
- * The methods {@link #getLocatedClasses()} and {@link #size()} will throw an
- * {@link UnsupportedOperationException}.
  *
  * @author Andreas Gudian
  */
@@ -161,22 +158,6 @@ public class LazyTestsToRun
 return new BlockingIterator();
 }
 
-/**
- * Unsupported. Use {@link #iterator()} instead.
- */
-public int size()
-{
-throw new UnsupportedOperationException( "use method iterator()" );
-}
-
-/**
- * Unsupported. Use {@link #iterator()} instead.
- */
-public Class[] getLocatedClasses()
-{
-throw new UnsupportedOperationException( "use method iterator()" );
-}
-
 /* (non-Javadoc)
   * @see org.apache.maven.surefire.util.TestsToRun#toString()
   */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f35f1efb/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java 
b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
index 734783e..210aa5a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java
@@ -64,16 +64,6 @@ public class TestsToRun
 return new

svn commit: r841534 - in /websites/production/maven/content/plugins/maven-release-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugins/ apido

[olamy]

Author: olamy
Date: Mon Dec 10 21:26:04 2012
New Revision: 841534

Log:
maven-release-plugin




[This commit notification would consist of 53 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1419785 - /maven/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 21:26:41 2012
New Revision: 1419785

URL: http://svn.apache.org/viewvc?rev=1419785&view=rev
Log:
fix missing maven-release-plugin 

Modified:
maven/site/trunk/content/resources/extpaths.txt

Modified: maven/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/extpaths.txt?rev=1419785&r1=1419784&r2=1419785&view=diff
==
--- maven/site/trunk/content/resources/extpaths.txt (original)
+++ maven/site/trunk/content/resources/extpaths.txt Mon Dec 10 21:26:41 2012
@@ -207,7 +207,7 @@ plugins/maven-project-info-reports-plugi
 plugins/maven-rar-plugin
 plugins/maven-rar-plugin-2.3
 plugins/maven-reactor-plugin
-plugins/maven-release-plugin-latest
+plugins/maven-release-plugin
 plugins/maven-release-plugin-2.0-beta-8
 plugins/maven-release-plugin-2.0-beta-9
 plugins/maven-release-plugin-2.0

svn commit: r841536 - in /websites/staging/maven/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 21:26:49 2012
New Revision: 841536

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/extpaths.txt

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 21:26:49 2012
@@ -1 +1 @@
-1419603
+1419785

Modified: websites/staging/maven/trunk/content/extpaths.txt
==
--- websites/staging/maven/trunk/content/extpaths.txt (original)
+++ websites/staging/maven/trunk/content/extpaths.txt Mon Dec 10 21:26:49 2012
@@ -207,7 +207,7 @@ plugins/maven-project-info-reports-plugi
 plugins/maven-rar-plugin
 plugins/maven-rar-plugin-2.3
 plugins/maven-reactor-plugin
-plugins/maven-release-plugin-latest
+plugins/maven-release-plugin
 plugins/maven-release-plugin-2.0-beta-8
 plugins/maven-release-plugin-2.0-beta-9
 plugins/maven-release-plugin-2.0

svn commit: r841539 [7/21] - in /websites/production/maven/content/plugins/maven-antrun-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/ant/ api

[olamy]

Added: 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/js/sortabletable.js
==
--- 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/js/sortabletable.js
 (added)
+++ 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/js/sortabletable.js
 Mon Dec 10 21:30:56 2012
@@ -0,0 +1,455 @@
+
+/*\
+|Sortable Table 1.12  |
+|-|
+| Created by Erik Arvidsson   |
+|  (http://webfx.eae.net/contact.html#erik)   |
+|  For WebFX (http://webfx.eae.net/)  |
+|-|
+| A DOM 1 based script that allows an ordinary HTML table to be sortable. |
+|-|
+|  Copyright (c) 1998 - 2004 Erik Arvidsson   |
+|-|
+| This software is provided "as is", without warranty of any kind, express or |
+| implied, including  but not limited  to the warranties of  merchantability, |
+| fitness for a particular purpose and noninfringement. In no event shall the |
+| authors or  copyright  holders be  liable for any claim,  damages or  other |
+| liability, whether  in an  action of  contract, tort  or otherwise, arising |
+| from,  out of  or in  connection with  the software or  the  use  or  other |
+| dealings in the software.   |
+| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
+| This  software is  available under the  three different licenses  mentioned |
+| below.  To use this software you must chose, and qualify, for one of those. |
+| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
+| The WebFX Non-Commercial License  http://webfx.eae.net/license.html |
+| Permits  anyone the right to use the  software in a  non-commercial context |
+| free of charge. |
+| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
+| The WebFX Commercial license   http://webfx.eae.net/commercial.html |
+| Permits the  license holder the right to use  the software in a  commercial |
+| context. Such license must be specifically obtained, however it's valid for |
+| any number of  implementations of the licensed software.|
+| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
+| GPL - The GNU General Public Licensehttp://www.gnu.org/licenses/gpl.txt |
+| Permits anyone the right to use and modify the software without limitations |
+| as long as proper  credits are given  and the original  and modified source |
+| code are included. Requires  that the final product, software derivate from |
+| the original  source or any  software  utilizing a GPL  component, such  as |
+| this, is also licensed under the GPL license.   |
+|-|
+| 2003-01-10 | First version  |
+| 2003-01-19 | Minor changes to the date parsing  |
+| 2003-01-28 | JScript 5.0 fixes (no support for 'in' operator)   |
+| 2003-02-01 | Sloppy typo like error fixed in getInnerText   |
+| 2003-07-04 | Added workaround for IE cellIndex bug. |
+| 2003-11-09 | The bDescending argument to sort was not correctly working |
+|| Using onclick DOM0 event if no support for addEventListener|
+|| or attachEvent |
+| 2004-01-13 | Adding addSortType and removeSortType which makes it a lot |
+|| easier to add new, custom sort types.  |
+| 2004-01-27 | Switch to use descending = false as the default sort order.|
+|| Change defaultDescending to suit your needs.   |
+| 2004-03-14 | Improved sort type None look and feel a bit|
+| 2004-08-26 | Made the handling of tBody and tHead more flexible. Now you|
+|| can use another tHead or no tHead, and you can chose some  |
+|| other tBody.   |
+|-|
+| Created 2003-01-10 | All changes are in the log above. | Updated 2004-08-26 |
+\-

svn commit: r841539 [9/21] - in /websites/production/maven/content/plugins/maven-antrun-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/ant/ api

[olamy]

Added: 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.ant.tasks.support.VersionMapper.html
==
--- 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.ant.tasks.support.VersionMapper.html
 (added)
+++ 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.ant.tasks.support.VersionMapper.html
 Mon Dec 10 21:30:56 2012
@@ -0,0 +1,188 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+Coverage Report
+
+
+
+
+Coverage Report - org.apache.maven.ant.tasks.support.VersionMapper
+ 
+
+  Classes in this File  Line Coverage  Branch Coverage  Complexity
+  VersionMapper0%0/240%0/82.25;2.25
+
+
+ 
+
+   1   
+   package 
org.apache.maven.ant.tasks.support;
+   2   
+   
+   3   
+   /*
+   4   
+    * Licensed to 
the Apache Software Foundation (ASF) under one
+   5   
+    * or more 
contributor license agreements.  See the NOTICE file
+   6   
+    * distributed 
with this work for additional information
+   7   
+    * regarding 
copyright ownership.  The ASF licenses this file
+   8   
+    * to you under 
the Apache License, Version 2.0 (the
+   9   
+    * "License"); 
you may not use this file except in compliance
+   10   
+    * with the 
License.  You may obtain a copy of the License at
+   11   
+    
*
+   12   
+    *  
http://www.apache.org/licenses/LICENSE-2.0
+   13   
+    
*
+   14   
+    * Unless 
required by applicable law or agreed to in writing,
+   15   
+    * software 
distributed under the License is distributed on an
+   16   
+    * "AS IS" 
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   17   
+    * KIND, either 
express or implied.  See the License for the
+   18   
+    * specific 
language governing permissions and limitations
+   19   
+    * under the 
License.
+   20   
+    
*/
+   21   
+   
+   22   
+   import 
java.io.File;
+   23   
+   import 
java.util.Arrays;
+   24   
+   import 
java.util.Comparator;
+   25   
+   import 
java.util.Iterator;
+   26   
+   import 
java.util.List;
+   27   
+   
+   28   
+   import 
org.apache.tools.ant.util.FileNameMapper;
+   29   
+   import 
org.codehaus.plexus.util.StringUtils;
+   30   
+   
+   31   
+   /**
+   32   
+    * Ant filename 
mapper to remove version info from filename when copying 
dependencies.
+   33   
+    
*
+   34   
+    * @author 
Herve 
Boutemy
+   35   
+    * @version 
$Id: VersionMapper.java 947173 2010-05-21 21:04:32Z pgier 
$
+   36   
+    
*/
+   37   0   public class VersionMapper
+   38   
+   implements FileNameMapper, Comparator
+   39   
+   {
+   40   
+   private List versions;
+   41   
+   
+   42   
+   private String to;
+   43   
+   
+   44   
+   public String[] mapFileName( String sourceFileName 
)
+   45   
+   {
+   46   0   String originalFileName = new File( sourceFileName 
).getName();
+   47   0   for ( 
Iterator iter = versions.iterator(); iter.hasNext(); 
)
+   48   
+   {
+   49   0   String version = (String) 
iter.next();
+   50   0   int index = 
originalFileName.indexOf( version );
+   51   0   if 
( index >= 0 )
+   52   
+   {
+   53   
+   // remove version in 
artifactId-version(-classifier).type
+   54   0   String baseFilename = 
originalFileName.substring( 0, index - 1 );
+   55   0   String extension = 
originalFileName.substring( index + version.length() );
+   56   0   String path = 
sourceFileName.substring( 0, sourceFileName.length() - 
originalFileName.length() );
+   57   0   if ( "flatten".equals( to ) 
)
+   58   
+   {
+   59   0   path = "";
+   60   
+   }
+   61   0   return 
new String[] { path + baseFilename + extension 
};
+   62   
+   }
+   63   0   }
+   64   0   return new String[] { sourceFileName };
+   65   
+   }
+   66   
+   
+   67   
+   /**
+   68   
+    * Set the 
versions identifiers that this mapper can remove from filenames. The separator 
value used is path
+   69   
+    * 
separator, as used by dependencies task when setting 
versionsId property value.
+   70   
+    
*/
+   71   
+   public void setFrom( String 
from )
+   72   
+   {
+   73   0   String[] split = StringUtils.split( from, 
File.pathSeparator );
+   74   
+   // 
sort, from lengthiest to smallest
+   75   0   Arrays.sort( split, this );
+   76   0   versions = Arrays.asList( split 
);
+   77   0   }
+   78   
+   
+   79   
+   /**
+   80   
+    * By 
default, only filename is changed, but if this attribute is set to 
flatten, directory is removed.
+   81

svn commit: r841539 [11/21] - in /websites/production/maven/content/plugins/maven-antrun-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/ant/ ap

[olamy]

Added: 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.plugin.antrun.AntrunXmlPlexusConfigurationWriter.html
==
--- 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.plugin.antrun.AntrunXmlPlexusConfigurationWriter.html
 (added)
+++ 
websites/production/maven/content/plugins/maven-antrun-plugin/cobertura/org.apache.maven.plugin.antrun.AntrunXmlPlexusConfigurationWriter.html
 Mon Dec 10 21:30:56 2012
@@ -0,0 +1,198 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+Coverage Report
+
+
+
+
+Coverage Report - 
org.apache.maven.plugin.antrun.AntrunXmlPlexusConfigurationWriter
+ 
+
+  Classes in this File  Line Coverage  Branch Coverage  Complexity
+  AntrunXmlPlexusConfigurationWriter0%0/260%0/82.0;2
+
+
+ 
+
+   1   
+   package 
org.apache.maven.plugin.antrun;
+   2   
+   
+   3   
+   /*
+   4   
+    * Licensed to 
the Apache Software Foundation (ASF) under one
+   5   
+    * or more 
contributor license agreements.  See the NOTICE file
+   6   
+    * distributed 
with this work for additional information
+   7   
+    * regarding 
copyright ownership.  The ASF licenses this file
+   8   
+    * to you under 
the Apache License, Version 2.0 (the
+   9   
+    * "License"); 
you may not use this file except in compliance
+   10   
+    * with the 
License.  You may obtain a copy of the License at
+   11   
+    
*
+   12   
+    *   
http://www.apache.org/licenses/LICENSE-2.0
+   13   
+    
*
+   14   
+    * Unless 
required by applicable law or agreed to in writing,
+   15   
+    * software 
distributed under the License is distributed on an
+   16   
+    * "AS IS" 
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   17   
+    * KIND, either 
express or implied.  See the License for the
+   18   
+    * specific 
language governing permissions and limitations
+   19   
+    * under the 
License.
+   20   
+    
*/
+   21   
+   
+   22   
+   import 
org.codehaus.plexus.configuration.PlexusConfiguration;
+   23   
+   import 
org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
+   24   
+   import 
org.codehaus.plexus.util.xml.XMLWriter;
+   25   
+   
+   26   
+   import 
java.io.IOException;
+   27   
+   import 
java.io.Writer;
+   28   
+   
+   29   
+   /**
+   30   
+    * Write a 
plexus configuration to a stream
+   31   
+    * Note: This 
class was originally copied from plexus-container-default.  It is duplicated 
here
+   32   
+    * to maintain 
compatibility with both Maven 2.x and Maven 3.x.
+   33   
+    
*
+   34   
+    
*/
+   35   0   public class 
AntrunXmlPlexusConfigurationWriter
+   36   
+   {
+   37   
+   
+   38   
+   public void write( 
PlexusConfiguration configuration, Writer writer )
+   39   
+   throws IOException
+   40   
+   {
+   41   0   int depth = 
0;
+   42   
+   
+   43   0   PrettyPrintXMLWriter xmlWriter = new PrettyPrintXMLWriter( writer 
);
+   44   0   write( configuration, xmlWriter, depth 
);
+   45   0   }
+   46   
+   
+   47   
+   private void write( 
PlexusConfiguration c, XMLWriter w, int depth 
)
+   48   
+   throws IOException
+   49   
+   {
+   50   0   int count = 
c.getChildCount();
+   51   
+   
+   52   0   if ( 
count == 0 )
+   53   
+   {
+   54   0   writeTag( c, w, depth 
);
+   55   
+   }
+   56   
+   else
+   57   
+   {
+   58   0   w.startElement( c.getName() 
);
+   59   0   writeAttributes( c, w 
);
+   60   
+   
+   61   0   for ( int i = 0; i < 
count; i++ )
+   62   
+   {
+   63   0   PlexusConfiguration child = 
c.getChild( i );
+   64   
+   
+   65   0   write( child, w, depth + 1 
);
+   66   
+   }
+   67   
+   
+   68   0   w.endElement();
+   69   
+   }
+   70   0   }
+   71   
+   
+   72   
+   private void writeTag( 
PlexusConfiguration c, XMLWriter w, int depth 
)
+   73   
+   throws IOException
+   74   
+   {
+   75   0   w.startElement( c.getName() 
);
+   76   
+   
+   77   0   writeAttributes( c, w 
);
+   78   
+   
+   79   0   String value = c.getValue( null );
+   80   0   if ( 
value != null )
+   81   
+   {
+   82   0   w.writeText( value 
);
+   83   
+   }
+   84   
+   
+   85   0   w.endElement();
+   86   0   }
+   87   
+   
+   88   
+   private void 
writeAttributes( PlexusConfiguration c, XMLWriter w )
+   89   
+   throws IOException
+   90   
+   {
+   91   0   String[] names = 
c.getAttributeNames();
+   92   
+   
+   93   0   for ( 
int i = 0; i < names.length; i++ 
)
+   94   
+   {
+   95   0   w.ad

svn commit: r841542 - in /websites/production/maven/content/plugins/maven-checkstyle-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugin/ api

[olamy]

Author: olamy
Date: Mon Dec 10 21:34:21 2012
New Revision: 841542

Log:
import checkstyle plugin


[This commit notification would consist of 62 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r841546 [6/18] - in /websites/production/maven/content/plugins/maven-clean-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugin/ a

[olamy]

Added: 
websites/production/maven/content/plugins/maven-clean-plugin/cobertura/org.apache.maven.plugin.clean.GlobSelector.html
==
--- 
websites/production/maven/content/plugins/maven-clean-plugin/cobertura/org.apache.maven.plugin.clean.GlobSelector.html
 (added)
+++ 
websites/production/maven/content/plugins/maven-clean-plugin/cobertura/org.apache.maven.plugin.clean.GlobSelector.html
 Mon Dec 10 21:37:53 2012
@@ -0,0 +1,291 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+Coverage Report
+
+
+
+
+Coverage Report - org.apache.maven.plugin.clean.GlobSelector
+ 
+
+  Classes in this File  Line Coverage  Branch Coverage  Complexity
+  GlobSelector73 
%30/4158 
%21/363.1;3,1
+
+
+ 
+
+   1   
+   package 
org.apache.maven.plugin.clean;
+   2   
+   
+   3   
+   /*
+   4   
+    * Licensed to 
the Apache Software Foundation (ASF) under one
+   5   
+    * or more 
contributor license agreements.  See the NOTICE file
+   6   
+    * distributed 
with this work for additional information
+   7   
+    * regarding 
copyright ownership.  The ASF licenses this file
+   8   
+    * to you under 
the Apache License, Version 2.0 (the
+   9   
+    * "License"); 
you may not use this file except in compliance
+   10   
+    * with the 
License.  You may obtain a copy of the License at
+   11   
+    
*
+   12   
+    *   
http://www.apache.org/licenses/LICENSE-2.0
+   13   
+    
*
+   14   
+    * Unless 
required by applicable law or agreed to in writing,
+   15   
+    * software 
distributed under the License is distributed on an
+   16   
+    * "AS IS" 
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   17   
+    * KIND, either 
express or implied.  See the License for the
+   18   
+    * specific 
language governing permissions and limitations
+   19   
+    * under the 
License.
+   20   
+    
*/
+   21   
+   
+   22   
+   import 
java.io.File;
+   23   
+   import 
java.util.Arrays;
+   24   
+   
+   25   
+   import 
org.codehaus.plexus.util.DirectoryScanner;
+   26   
+   import 
org.codehaus.plexus.util.SelectorUtils;
+   27   
+   
+   28   
+   /**
+   29   
+    * Selects 
paths based on Ant-like glob patterns.
+   30   
+    * 

+   31   
+    * @author 
Benjamin Bentmann
+   32   
+    
*/
+   33   
+   class 
GlobSelector
+   34   
+   implements Selector
+   35   
+   {
+   36   
+   
+   37   
+   private final String[] 
includes;
+   38   
+   
+   39   
+   private final String[] 
excludes;
+   40   
+   
+   41   
+   private final String 
str;
+   42   
+   
+   43   
+   public GlobSelector( String[] includes, String[] 
excludes )
+   44   
+   {
+   45   0   this( includes, 
excludes, false );
+   46   0   }
+   47   
+   
+   48   
+   public GlobSelector( String[] includes, String[] 
excludes, boolean useDefaultExcludes 
)
+   49   2   
{
+   50   2    
   this.str = "includes = 
" + toString( includes ) + ", excludes = " + 
toString( excludes );
+   51   2    
   this.includes = normalizePatterns( includes 
);
+   52   2    
   this.excludes = normalizePatterns( 
addDefaultExcludes( excludes, useDefaultExcludes ) );
+   53   2   
}
+   54   
+   
+   55   
+   private static String 
toString( String[] patterns )
+   56   
+   {
+   57   4   return ( patterns == null ) 
? "[]" : Arrays.asList( patterns 
).toString();
+   58   
+   }
+   59   
+   
+   60   
+   private static String[] 
addDefaultExcludes( String[] excludes, boolean 
useDefaultExcludes )
+   61   
+   {
+   62   2    
   String[] defaults = DirectoryScanner.DEFAULTEXCLUDES;
+   63   2   if ( 
!useDefaultExcludes )
+   64   
+   {
+   65   2    
   return excludes;
+   66   
+   }
+   67   0   else if ( excludes == null || 
excludes.length <= 0 )
+   68   
+   {
+   69   0   return 
defaults;
+   70   
+   }
+   71   
+   else
+   72   
+   {
+   73   0   String[] patterns = new String[excludes.length + 
defaults.length];
+   74   0   System.arraycopy( excludes, 0, patterns, 
0, excludes.length );
+   75   0   System.arraycopy( defaults, 0, patterns, 
excludes.length, defaults.length );
+   76   0   return 
patterns;
+   77   
+   }
+   78   
+   }
+   79   
+   
+   80   
+   private static String[] 
normalizePatterns( String[] patterns )
+   81   
+   {
+   82   
+   String[] 
normalized;
+   83   
+   
+   84   4   if ( 
patterns != null )
+   85   
+   {
+   86   4    
   normalized = new 
String[patterns.length];
+   87   9   for ( int i = patterns.length - 1; i >= 0; i-- 
)
+   88   
+   {
+   89   5    
   normalized[i] = normalizePattern( patterns[i] );
+   90   
+   }
+   91   
+   }
+   92  

svn commit: r841548 [17/34] - in /websites/production/maven/content/plugins/maven-doap-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugin/ a

[olamy]

Added: 
websites/production/maven/content/plugins/maven-doap-plugin/cobertura/org.apache.maven.plugin.doap.options.DoapArtifact.html
==
--- 
websites/production/maven/content/plugins/maven-doap-plugin/cobertura/org.apache.maven.plugin.doap.options.DoapArtifact.html
 (added)
+++ 
websites/production/maven/content/plugins/maven-doap-plugin/cobertura/org.apache.maven.plugin.doap.options.DoapArtifact.html
 Mon Dec 10 21:40:31 2012
@@ -0,0 +1,424 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+Coverage Report
+
+
+
+
+Coverage Report - org.apache.maven.plugin.doap.options.DoapArtifact
+ 
+
+  Classes in this File  Line Coverage  Branch Coverage  Complexity
+  DoapArtifact0 
%0/560 
%0/460.0;0
+
+
+ 
+
+   1   
+   /*
+   2   
+    
=== DO NOT EDIT THIS FILE 

+   3   
+    Generated by 
Modello 1.4.1 on 2011-01-16 07:55:33,
+   4   
+    any 
modifications will be overwritten.
+   5   
+    
==
+   6   
+    
*/
+   7   
+   
+   8   
+   package 
org.apache.maven.plugin.doap.options;
+   9   
+   
+   10   
+   /**
+   11   
+    * An Maven 
artifact object used by DOAP.
+   12   
+    * 

+   13   
+    * @version 
$Revision$ $Date$
+   14   
+    
*/
+   15   
+   @SuppressWarnings( "all" )
+   16   0   public class DoapArtifact
+   17   
+   implements java.io.Serializable
+   18   
+   {
+   19   
+   
+   20   
+     //--/
+   21   
+    //- 
Class/Member Variables -/
+   22   
+   //--/
+   23   
+   
+   24   
+   /**
+   25   
+    * The id 
of the group of the Maven artifact.
+   26   
+    
*/
+   27   
+   private String groupId;
+   28   
+   
+   29   
+   /**
+   30   
+    * The 
artifact id of the Maven artifact.
+   31   
+    
*/
+   32   
+   private String artifactId;
+   33   
+   
+   34   
+   /**
+   35   
+    * The 
version of the Maven artifact.
+   36   
+    
*/
+   37   
+   private String version;
+   38   
+   
+   39   
+   /**
+   40   
+    * The name 
of the DOAP file that will be generated, no notion
+   41   
+    * of 
path.
+   42   
+    
*/
+   43   
+   private String doapFileName;
+   44   
+   
+   45   
+   
+   46   
+     //---/
+   47   
+    //- 
Methods -/
+   48   
+   //---/
+   49   
+   
+   50   
+   /**
+   51   
+    * Method 
equals.
+   52   
+    * 

+   53   
+    * @param 
other
+   54   
+    * @return 
boolean
+   55   
+    
*/
+   56   
+   public boolean equals( 
Object other )
+   57   
+   {
+   58   0   if ( 
this == other )
+   59   
+   {
+   60   0   return 
true;
+   61   
+   }
+   62   
+   
+   63   0   if ( 
!( other instanceof DoapArtifact ) 
)
+   64   
+   {
+   65   0   return 
false;
+   66   
+   }
+   67   
+   
+   68   0   DoapArtifact that = (DoapArtifact) 
other;
+   69   0   boolean result 
= true;
+   70   
+   
+   71   0   result = result && ( 
getGroupId() == null ? that.getGroupId() == null : getGroupId().equals( that.getGroupId() ) 
);
+   72   0   result = result && ( 
getArtifactId() == null ? that.getArtifactId() == 
null : getArtifactId().equals( 
that.getArtifactId() ) );
+   73   0   result = result && ( 
getVersion() == null ? that.getVersion() == null : getVersion().equals( that.getVersion() ) 
);
+   74   0   result = result && ( 
getDoapFileName() == null ? that.getDoapFileName() 
== null : getDoapFileName().equals( 
that.getDoapFileName() ) );
+   75   
+   
+   76   0   return 
result;
+   77   
+   } //-- 
boolean equals( Object )
+   78   
+   
+   79   
+   /**
+   80   
+    * Get the 
artifact id of the Maven artifact.
+   81   
+    * 

+   82   
+    * @return 
String
+   83   
+    
*/
+   84   
+   public String getArtifactId()
+   85   
+   {
+   86   0   return this.artifactId;
+   87   
+   } //-- 
String getArtifactId()
+   88   
+   
+   89   
+   /**
+   90   
+    * Get the 
id of the group of the Maven artifact.
+   91   
+    * 

+   92   
+    * @return 
String
+   93   
+    
*/
+   94   
+   public String getGroupId()
+   95   
+   {
+   96   0   return this.groupId;
+   97   
+   } //-- 
String getGroupId()
+   98   
+   
+   99   
+   /**
+   100   
+    * Get the 
version of the Maven artifact.
+   101   
+    * 

+   102   
+    * @return 
String
+   103   
+    
*/
+   104   
+   public String getVersion()
+   105   
+   {
+   106   0   return this.version;
+   107   
+   } //-- 
String getVersion()
+   108   
+   
+   109   
+   /**
+   110   
+  

svn commit: r841548 [31/34] - in /websites/production/maven/content/plugins/maven-doap-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugin/ a

[olamy]

Added: 
websites/production/maven/content/plugins/maven-doap-plugin/xref-test/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.html
==
--- 
websites/production/maven/content/plugins/maven-doap-plugin/xref-test/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.html
 (added)
+++ 
websites/production/maven/content/plugins/maven-doap-plugin/xref-test/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.html
 Mon Dec 10 21:40:31 2012
@@ -0,0 +1,149 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+
+AsfDoapProjectStub xref
+
+
+
+
+
+1   package 
org.apache.maven.plugin.doap.stubs;
+2   
+3   /*
+4* Licensed to the 
Apache Software Foundation (ASF) under one
+5* or more contributor 
license agreements.  See the NOTICE file
+6* distributed with this 
work for additional information
+7* regarding copyright 
ownership.  The ASF licenses this file
+8* to you under the 
Apache License, Version 2.0 (the
+9* "License"); you may 
not use this file except in compliance
+10   * with the License.  
You may obtain a copy of the License at
+11   *
+12   *   http://www.apache.org/licenses/LICENSE-2.0"; 
target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0
+13   *
+14   * Unless required by 
applicable law or agreed to in writing,
+15   * software 
distributed under the License is distributed on an
+16   * "AS IS" BASIS, 
WITHOUT WARRANTIES OR CONDITIONS OF ANY
+17   * KIND, either 
express or implied.  See the License for the
+18   * specific language 
governing permissions and limitations
+19   * under the 
License.
+20   */
+21  
+22  import 
java.io.File;
+23  import 
java.util.Collections;
+24  import 
java.util.List;
+25  
+26  import 
org.apache.maven.artifact.repository.ArtifactRepository;
+27  import 
org.apache.maven.artifact.repository.DefaultArtifactRepository;
+28  import 
org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+29  import 
org.apache.maven.model.Developer;
+30  import 
org.apache.maven.model.DistributionManagement;
+31  import 
org.apache.maven.model.IssueManagement;
+32  import 
org.apache.maven.model.License;
+33  import 
org.apache.maven.model.Model;
+34  import 
org.apache.maven.model.Organization;
+35  import 
org.apache.maven.model.Scm;
+36  import 
org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+37  import 
org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+38  import 
org.codehaus.plexus.util.ReaderFactory;
+39  
+40  /**
+41   * @author 
mailto:vincent.sive...@gmail.com">Vincent 
Siveton
+42   * @version 
$Id: AsfDoapProjectStub.java 1056464 2011-01-07 19:09:14Z vsiveton $
+43   */
+44  public 
class AsfDoapProjectStub
+45  extends MavenProjectStub
+46  {
+47  private Model model;
+48  
+49  /**
+50   * Default 
constructor
+51   */
+52  public AsfDoapProjectStub()
+53  {
+54  MavenXpp3Reader pomReader = new MavenXpp3Reader();
+55  try
+56  {
+57  model =
+58  pomReader.read( 
ReaderFactory.newXmlReader( new File(
+59 
   new File( super.getBasedir(),
+60 
 "/src/test/resources/unit/asf-doap-configuration/" ),
+61 
   "asf-doap-configuration-plugin-config.xml" ) ) );
+62  setModel( model );
+63  }
+64  catch ( Exception e )
+65  {
+66  throw new 
RuntimeException( e );
+67  }
+68  
+69  setGroupId( model.getGroupId() );
+70  setArtifactId( model.getArtifactId() );
+71  setVersion( model.getVersion() );
+72  setName( model.getName() );
+73  setDescription( model.getDescription() 
);
+74  setUrl( model.getUrl() );
+75  setPackaging( model.getPackaging() );
+76  setDevelopers( model.getDevelopers() );
+77  }
+78  
+79  @Override
+80  public List getDevelopers()
+81  {
+82  return model.getDevelopers();
+83  }
+84  
+85  @Override
+86  public List getLicenses()
+87  {
+88  return model.getLicenses();
+89  }
+90  
+91  @Override
+92  public Organization getOrganization()
+93  {
+94  return model.getOrganization();
+95  }
+96  
+97  @Override
+98  public Scm getScm()
+99  {
+100 return model.getScm();
+101 }
+102 
+103 @Override
+104 public IssueManagement getIssueManagement()
+105 {
+106 return model.getIssueManagement();
+107 }
+108 
+109 @Override
+110 public String getDescription()
+111 {
+112 return model.getDescription();
+113 }

svn commit: r841549 - in /websites/production/maven/content/plugins/maven-pmd-plugin: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/plugin/ apidocs/or

[olamy]

Author: olamy
Date: Mon Dec 10 21:43:51 2012
New Revision: 841549

Log:
import pmd plugin


[This commit notification would consist of 56 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1419812 - /maven/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 21:44:34 2012
New Revision: 1419812

URL: http://svn.apache.org/viewvc?rev=1419812&view=rev
Log:
fix missing content

Modified:
maven/site/trunk/content/resources/extpaths.txt

Modified: maven/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/extpaths.txt?rev=1419812&r1=1419811&r2=1419812&view=diff
==
--- maven/site/trunk/content/resources/extpaths.txt (original)
+++ maven/site/trunk/content/resources/extpaths.txt Mon Dec 10 21:44:34 2012
@@ -22,7 +22,7 @@ plugins/maven-ant-plugin
 plugins/maven-ant-plugin-2.1
 plugins/maven-ant-plugin-2.2
 plugins/maven-ant-plugin-2.3
-plugins/maven-antrun-plugin-latest
+plugins/maven-antrun-plugin
 plugins/maven-antrun-plugin-1.2
 plugins/maven-antrun-plugin-1.3
 plugins/maven-antrun-plugin-1.4
@@ -52,7 +52,7 @@ plugins/maven-changes-plugin-2.6
 plugins/maven-changes-plugin-2.7
 plugins/maven-changes-plugin-2.7.1
 plugins/maven-changes-plugin-2.8
-plugins/maven-checkstyle-plugin-latest
+plugins/maven-checkstyle-plugin
 plugins/maven-checkstyle-plugin-2.2
 plugins/maven-checkstyle-plugin-2.3
 plugins/maven-checkstyle-plugin-2.4
@@ -62,7 +62,7 @@ plugins/maven-checkstyle-plugin-2.7
 plugins/maven-checkstyle-plugin-2.8
 plugins/maven-checkstyle-plugin-2.9
 plugins/maven-checkstyle-plugin-2.9.1
-plugins/maven-clean-plugin-latest
+plugins/maven-clean-plugin
 plugins/maven-clean-plugin-2.3
 plugins/maven-clean-plugin-2.4
 plugins/maven-clean-plugin-2.4.1
@@ -88,7 +88,7 @@ plugins/maven-deploy-plugin-2.4
 plugins/maven-deploy-plugin-2.5
 plugins/maven-deploy-plugin-2.6
 plugins/maven-deploy-plugin-2.7
-plugins/maven-doap-plugin-latest
+plugins/maven-doap-plugin
 plugins/maven-doap-plugin-1.0
 plugins/maven-doap-plugin-1.1
 plugins/maven-docck-plugin
@@ -188,7 +188,7 @@ plugins/maven-pdf-plugin
 plugins/maven-pdf-plugin-1.0
 plugins/maven-pdf-plugin-1.1
 plugins/maven-pdf-plugin-1.2
-plugins/maven-pmd-plugin-latest
+plugins/maven-pmd-plugin
 plugins/maven-pmd-plugin-2.5
 plugins/maven-pmd-plugin-2.6
 plugins/maven-pmd-plugin-2.7

svn commit: r841550 - in /websites/staging/maven/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 21:44:39 2012
New Revision: 841550

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/extpaths.txt

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 21:44:39 2012
@@ -1 +1 @@
-1419785
+1419812

Modified: websites/staging/maven/trunk/content/extpaths.txt
==
--- websites/staging/maven/trunk/content/extpaths.txt (original)
+++ websites/staging/maven/trunk/content/extpaths.txt Mon Dec 10 21:44:39 2012
@@ -22,7 +22,7 @@ plugins/maven-ant-plugin
 plugins/maven-ant-plugin-2.1
 plugins/maven-ant-plugin-2.2
 plugins/maven-ant-plugin-2.3
-plugins/maven-antrun-plugin-latest
+plugins/maven-antrun-plugin
 plugins/maven-antrun-plugin-1.2
 plugins/maven-antrun-plugin-1.3
 plugins/maven-antrun-plugin-1.4
@@ -52,7 +52,7 @@ plugins/maven-changes-plugin-2.6
 plugins/maven-changes-plugin-2.7
 plugins/maven-changes-plugin-2.7.1
 plugins/maven-changes-plugin-2.8
-plugins/maven-checkstyle-plugin-latest
+plugins/maven-checkstyle-plugin
 plugins/maven-checkstyle-plugin-2.2
 plugins/maven-checkstyle-plugin-2.3
 plugins/maven-checkstyle-plugin-2.4
@@ -62,7 +62,7 @@ plugins/maven-checkstyle-plugin-2.7
 plugins/maven-checkstyle-plugin-2.8
 plugins/maven-checkstyle-plugin-2.9
 plugins/maven-checkstyle-plugin-2.9.1
-plugins/maven-clean-plugin-latest
+plugins/maven-clean-plugin
 plugins/maven-clean-plugin-2.3
 plugins/maven-clean-plugin-2.4
 plugins/maven-clean-plugin-2.4.1
@@ -88,7 +88,7 @@ plugins/maven-deploy-plugin-2.4
 plugins/maven-deploy-plugin-2.5
 plugins/maven-deploy-plugin-2.6
 plugins/maven-deploy-plugin-2.7
-plugins/maven-doap-plugin-latest
+plugins/maven-doap-plugin
 plugins/maven-doap-plugin-1.0
 plugins/maven-doap-plugin-1.1
 plugins/maven-docck-plugin
@@ -188,7 +188,7 @@ plugins/maven-pdf-plugin
 plugins/maven-pdf-plugin-1.0
 plugins/maven-pdf-plugin-1.1
 plugins/maven-pdf-plugin-1.2
-plugins/maven-pmd-plugin-latest
+plugins/maven-pmd-plugin
 plugins/maven-pmd-plugin-2.5
 plugins/maven-pmd-plugin-2.6
 plugins/maven-pmd-plugin-2.7

svn commit: r1419819 - /maven/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 21:49:18 2012
New Revision: 1419819

URL: http://svn.apache.org/viewvc?rev=1419819&view=rev
Log:
remove too old content

Modified:
maven/site/trunk/content/resources/extpaths.txt

Modified: maven/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/extpaths.txt?rev=1419819&r1=1419818&r2=1419819&view=diff
==
--- maven/site/trunk/content/resources/extpaths.txt (original)
+++ maven/site/trunk/content/resources/extpaths.txt Mon Dec 10 21:49:18 2012
@@ -208,8 +208,6 @@ plugins/maven-rar-plugin
 plugins/maven-rar-plugin-2.3
 plugins/maven-reactor-plugin
 plugins/maven-release-plugin
-plugins/maven-release-plugin-2.0-beta-8
-plugins/maven-release-plugin-2.0-beta-9
 plugins/maven-release-plugin-2.0
 plugins/maven-release-plugin-2.1
 plugins/maven-release-plugin-2.2
@@ -237,8 +235,6 @@ plugins/maven-scm-publish-plugin
 plugins/maven-scm-publish-plugin-1.0-beta-1
 plugins/maven-scm-publish-plugin-1.0-beta-2
 plugins/maven-shade-plugin
-plugins/maven-shade-plugin-1.2.1
-plugins/maven-shade-plugin-1.2.2
 plugins/maven-shade-plugin-1.3
 plugins/maven-shade-plugin-1.3.1
 plugins/maven-shade-plugin-1.3.2
@@ -266,13 +262,7 @@ plugins/maven-source-plugin-2.1.1
 plugins/maven-source-plugin-2.1.2
 plugins/maven-source-plugin-2.2
 plugins/maven-stage-plugin
-plugins/maven-stage-plugin-1.0-alpha-2
 plugins/maven-surefire-plugin
-plugins/maven-surefire-plugin-2.5
-plugins/maven-surefire-plugin-2.6
-plugins/maven-surefire-plugin-2.7
-plugins/maven-surefire-plugin-2.7.1
-plugins/maven-surefire-plugin-2.7.2
 plugins/maven-surefire-plugin-2.8
 plugins/maven-surefire-plugin-2.8.1
 plugins/maven-surefire-plugin-2.9
@@ -391,11 +381,9 @@ skins/maven-stylus-skin-1.4
 skins/maven-stylus-skin-1.5
 surefire
 surefire-2.10
-surefire-2.8.1
 surefire-2.9
 wagon
 wagon-1.0
-wagon-1.0-beta-7
 wagon-2.0
 wagon-2.1
 wagon-2.2

svn commit: r841553 - in /websites/staging/maven/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 21:49:22 2012
New Revision: 841553

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/extpaths.txt

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 21:49:22 2012
@@ -1 +1 @@
-1419812
+1419819

Modified: websites/staging/maven/trunk/content/extpaths.txt
==
--- websites/staging/maven/trunk/content/extpaths.txt (original)
+++ websites/staging/maven/trunk/content/extpaths.txt Mon Dec 10 21:49:22 2012
@@ -208,8 +208,6 @@ plugins/maven-rar-plugin
 plugins/maven-rar-plugin-2.3
 plugins/maven-reactor-plugin
 plugins/maven-release-plugin
-plugins/maven-release-plugin-2.0-beta-8
-plugins/maven-release-plugin-2.0-beta-9
 plugins/maven-release-plugin-2.0
 plugins/maven-release-plugin-2.1
 plugins/maven-release-plugin-2.2
@@ -237,8 +235,6 @@ plugins/maven-scm-publish-plugin
 plugins/maven-scm-publish-plugin-1.0-beta-1
 plugins/maven-scm-publish-plugin-1.0-beta-2
 plugins/maven-shade-plugin
-plugins/maven-shade-plugin-1.2.1
-plugins/maven-shade-plugin-1.2.2
 plugins/maven-shade-plugin-1.3
 plugins/maven-shade-plugin-1.3.1
 plugins/maven-shade-plugin-1.3.2
@@ -266,13 +262,7 @@ plugins/maven-source-plugin-2.1.1
 plugins/maven-source-plugin-2.1.2
 plugins/maven-source-plugin-2.2
 plugins/maven-stage-plugin
-plugins/maven-stage-plugin-1.0-alpha-2
 plugins/maven-surefire-plugin
-plugins/maven-surefire-plugin-2.5
-plugins/maven-surefire-plugin-2.6
-plugins/maven-surefire-plugin-2.7
-plugins/maven-surefire-plugin-2.7.1
-plugins/maven-surefire-plugin-2.7.2
 plugins/maven-surefire-plugin-2.8
 plugins/maven-surefire-plugin-2.8.1
 plugins/maven-surefire-plugin-2.9
@@ -391,11 +381,9 @@ skins/maven-stylus-skin-1.4
 skins/maven-stylus-skin-1.5
 surefire
 surefire-2.10
-surefire-2.8.1
 surefire-2.9
 wagon
 wagon-1.0
-wagon-1.0-beta-7
 wagon-2.0
 wagon-2.1
 wagon-2.2

svn commit: r1419823 - /maven/site/trunk/content/resources/extpaths.txt

[olamy]

Author: olamy
Date: Mon Dec 10 21:57:57 2012
New Revision: 1419823

URL: http://svn.apache.org/viewvc?rev=1419823&view=rev
Log:
remove too old content

Modified:
maven/site/trunk/content/resources/extpaths.txt

Modified: maven/site/trunk/content/resources/extpaths.txt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/extpaths.txt?rev=1419823&r1=1419822&r2=1419823&view=diff
==
--- maven/site/trunk/content/resources/extpaths.txt (original)
+++ maven/site/trunk/content/resources/extpaths.txt Mon Dec 10 21:57:57 2012
@@ -274,11 +274,6 @@ plugins/maven-surefire-plugin-2.12.2
 plugins/maven-surefire-plugin-2.12.3
 plugins/maven-surefire-plugin-2.12.4
 plugins/maven-surefire-report-plugin
-plugins/maven-surefire-report-plugin-2.5
-plugins/maven-surefire-report-plugin-2.6
-plugins/maven-surefire-report-plugin-2.7
-plugins/maven-surefire-report-plugin-2.7.1
-plugins/maven-surefire-report-plugin-2.7.2
 plugins/maven-surefire-report-plugin-2.8
 plugins/maven-surefire-report-plugin-2.9
 plugins/maven-surefire-report-plugin-2.10

svn commit: r841555 - in /websites/staging/maven/trunk/content: ./ extpaths.txt

[buildbot]

Author: buildbot
Date: Mon Dec 10 21:58:02 2012
New Revision: 841555

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/extpaths.txt

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 21:58:02 2012
@@ -1 +1 @@
-1419819
+1419823

Modified: websites/staging/maven/trunk/content/extpaths.txt
==
--- websites/staging/maven/trunk/content/extpaths.txt (original)
+++ websites/staging/maven/trunk/content/extpaths.txt Mon Dec 10 21:58:02 2012
@@ -274,11 +274,6 @@ plugins/maven-surefire-plugin-2.12.2
 plugins/maven-surefire-plugin-2.12.3
 plugins/maven-surefire-plugin-2.12.4
 plugins/maven-surefire-report-plugin
-plugins/maven-surefire-report-plugin-2.5
-plugins/maven-surefire-report-plugin-2.6
-plugins/maven-surefire-report-plugin-2.7
-plugins/maven-surefire-report-plugin-2.7.1
-plugins/maven-surefire-report-plugin-2.7.2
 plugins/maven-surefire-report-plugin-2.8
 plugins/maven-surefire-report-plugin-2.9
 plugins/maven-surefire-report-plugin-2.10

svn commit: r841556 - in /websites/production/maven/content/surefire: ./ maven-failsafe-plugin/ maven-surefire-common/ maven-surefire-plugin/ maven-surefire-report-plugin/ surefire-api/ surefire-boote

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 21:58:22 2012
New Revision: 841556

Log:
updated Surefire site to 2.12.4


[This commit notification would consist of 97 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r841558 [7/30] - in /websites/production/maven/content/enforcer: ./ enforcer-api/ enforcer-api/apidocs/ enforcer-api/apidocs/org/apache/maven/enforcer/rule/api/ enforcer-api/apidocs/org/ap

[olamy]

Modified: 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-frame.html
==
--- 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-frame.html
 (original)
+++ 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-frame.html
 Mon Dec 10 22:04:20 2012
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
-org.apache.maven.plugins.enforcer (Enforcer Rules 1.1.1 API)
+org.apache.maven.plugins.enforcer (Enforcer Rules 1.2 API)
 
 
-
+
 
 
 
@@ -28,6 +28,8 @@ Classes 
 
 AbstractNonCacheableEnforcerRule
 
+AbstractPropertyEnforcerRule
+
 AbstractRequireFiles
 
 AbstractStandardEnforcerRule
@@ -42,6 +44,8 @@ Classes 
 
 BannedPlugins
 
+BanTransitiveDependencies
+
 DefaultEnforcementRuleHelper
 
 DependencyConvergence
@@ -54,6 +58,8 @@ Classes 
 
 RequireActiveProfile
 
+RequireEnvironmentVariable
+
 RequireFilesDontExist
 
 RequireFilesExist

Modified: 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-summary.html
==
--- 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-summary.html
 (original)
+++ 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-summary.html
 Mon Dec 10 22:04:20 2012
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
-org.apache.maven.plugins.enforcer (Enforcer Rules 1.1.1 API)
+org.apache.maven.plugins.enforcer (Enforcer Rules 1.2 API)
 
 
-
+
 
 
 
@@ -16,7 +16,7 @@ org.apache.maven.plugins.enforcer (Enfor
 function windowTitle()
 {
 if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="org.apache.maven.plugins.enforcer (Enforcer 
Rules 1.1.1 API)";
+parent.document.title="org.apache.maven.plugins.enforcer (Enforcer 
Rules 1.2 API)";
 }
 }
 
@@ -98,6 +98,10 @@ Package org.apache.maven.plugins.enforce
 The Class AbstractNonCacheableEnforcerRule.
 
 
+AbstractPropertyEnforcerRule
+Abstract enforcer rule that give a foundation to validate properties from 
multiple sources.
+
+
 AbstractRequireFiles
 Contains the common code to compare an array of files against a 
requirement.
 
@@ -126,6 +130,10 @@ Package org.apache.maven.plugins.enforce
 This rule checks that lists of plugins are not included.
 
 
+BanTransitiveDependencies
+This rule bans all transitive dependencies.
+
+
 DefaultEnforcementRuleHelper
 Default implementation of the EnforcementRuleHelper interface.
 
@@ -150,6 +158,10 @@ Package org.apache.maven.plugins.enforce
 This rule checks that some profiles are active.
 
 
+RequireEnvironmentVariable
+This rule checks that certain environment variable is set.
+
+
 RequireFilesDontExist
 The Class RequireFilesDontExist.
 

Modified: 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-tree.html
==
--- 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-tree.html
 (original)
+++ 
websites/production/maven/content/enforcer/enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/package-tree.html
 Mon Dec 10 22:04:20 2012
@@ -2,13 +2,13 @@
 
 
 
-
+
 
 
-org.apache.maven.plugins.enforcer Class Hierarchy (Enforcer Rules 1.1.1 API)
+org.apache.maven.plugins.enforcer Class Hierarchy (Enforcer Rules 1.2 API)
 
 
-
+
 
 
 
@@ -16,7 +16,7 @@ org.apache.maven.plugins.enforcer Class 
 function windowTitle()
 {
 if (location.href.indexOf('is-external=true') == -1) {
-parent.document.title="org.apache.maven.plugins.enforcer Class 
Hierarchy (Enforcer Rules 1.1.1 API)";
+parent.document.title="org.apache.maven.plugins.enforcer Class 
Hierarchy (Enforcer Rules 1.2 API)";
 }
 }
 
@@ -99,7 +99,9 @@ Class Hierarchy
 org.apache.maven.plugins.enforcer.BannedDependencies
 org.apache.maven.plugins.enforcer.BannedPlugins
 org.apache.maven.plugins.enforcer.NoSnapshotsorg.apache.maven.plugins.enforcer.RequireReleaseDeps
-org.apache.maven.plugins.enforcer.AlwaysFailorg.apache.maven.plugins.enforcer.AlwaysPassorg.apache.maven.plugins.enforcer.EvaluateBeanshellorg.apache.maven.plugins.enforcer.RequireActiveProfileorg.apache.maven.plugins.enforcer.RequireNoRepositoriesorg.apache.maven.plugins.enforcer.RequirePluginVersionsorg.apache.maven.plugins.enforcer.RequirePropertyorg.apache.maven.plugins.enforcer.RequireReleaseVersionorg.apache.maven.plugins.enforcer.RequireUpperBoundDeps
+org.apache.maven.plugins.enforcer.AbstractPropertyEnforcerRule
+org.apache.maven.plugins.enforcer.RequireEnvironmentVariableorg.apache.maven.plugins.enforcer.RequireProperty
+org.apache.maven.plugins.enforcer.AlwaysFailorg.apache.mave

svn commit: r841558 [14/30] - in /websites/production/maven/content/enforcer: ./ enforcer-api/ enforcer-api/apidocs/ enforcer-api/apidocs/org/apache/maven/enforcer/rule/api/ enforcer-api/apidocs/org/a

[olamy]

Modified: 
websites/production/maven/content/enforcer/enforcer-rules/cobertura/org.apache.maven.plugins.enforcer.RequireOS.html
==
--- 
websites/production/maven/content/enforcer/enforcer-rules/cobertura/org.apache.maven.plugins.enforcer.RequireOS.html
 (original)
+++ 
websites/production/maven/content/enforcer/enforcer-rules/cobertura/org.apache.maven.plugins.enforcer.RequireOS.html
 Mon Dec 10 22:04:20 2012
@@ -12,7 +12,7 @@
  
 
   Classes in this File  Line Coverage  Branch Coverage  Complexity
-  RequireOS0%0/710%0/402.05;2.05
+  RequireOS77%55/7132%13/402.05;2.05
 
 
  
@@ -139,32 +139,32 @@
     * 

    61   
     
*/
-   62   0   public String 
family = null;
+   62   2   
public String family = null;
    63   
    
    64   
    /** The OS 
name desired. */
-   65   0   public String name 
= null;
+   65   2   
public String name = null;
    66   
    
    67   
    /** The OS 
version desired. */
-   68   0   public String 
version = null;
+   68   2   
public String version = null;
    69   
    
    70   
    /** The OS 
architecture desired. */
-   71   0   public String arch 
= null;
+   71   2   
public String arch = null;
    72   
    
    73   
    /** Specify 
an optional message to the user if the rule fails. */
-   74   0   public String 
message = "";
+   74   2   
public String message = "";
    75   
    
    76   
    /** Display 
detected OS information. */
-   77   0   public boolean display = false;
+   77   2   
public boolean 
display = false;
    78   
    
    79   
@@ -175,10 +175,10 @@
     
*/
    82   
    public RequireOS()
-   83   0   {
+   83   2   
{
    84   
    
-   85   0   }
+   85   2   
}
    86   
    
    87   
@@ -199,10 +199,10 @@
    {
    95   
    
-   96   0   displayOSInfo( helper.getLog(), display 
);
+   96   1    
   displayOSInfo( helper.getLog(), display );
    97   
    
-   98   0   if ( 
allParamsEmpty() )
+   98   1   if ( 
allParamsEmpty() )
    99   
    {
    100   0   throw new EnforcerRuleException( "All 
parameters can not be empty. You must pick at least one of (family, name, 
version, arch) or use -Denforcer.os.display=true to see the current OS 
information." );
@@ -210,7 +210,7 @@
    }
    102   
    
-   103   0   if ( 
isValidFamily( this.family ) 
)
+   103   1   if ( 
isValidFamily( this.family ) 
)
    104   
    {
    105   0   if ( !isAllowed() )
@@ -239,17 +239,17 @@
    else
    119   
    {
-   120   0   StringBuilder buffer = new StringBuilder( 50 );
-   121   0   Iterator iter = 
Os.getValidFamilies().iterator();
-   122   0   while ( iter.hasNext() )
+   120   1    
   StringBuilder buffer = new StringBuilder( 
50 );
+   121   1    
   Iterator iter = Os.getValidFamilies().iterator();
+   122   12   while ( iter.hasNext() 
)
    123   
    {
-   124   0   buffer.append( iter.next() 
);
-   125   0   buffer.append( ", " );
+   124   11   
buffer.append( iter.next() );
+   125   11   
buffer.append( ", " );
    126   
    }
-   127   0   String help = StringUtils.stripEnd( 
buffer.toString().trim(), "." 
);
-   128   0   throw new EnforcerRuleException( "Invalid 
Family type used. Valid family types are: " + help 
);
+   127   1    
   String help = StringUtils.stripEnd( buffer.toString().trim(), "." );
+   128   1    
   throw new 
EnforcerRuleException( "Invalid Family type used. Valid 
family types are: " + help );
    129   
    }
    130   0   }
@@ -271,27 +271,27 @@
    public void displayOSInfo( 
Log log, boolean info )
    139   
    {
-   140   0   String string =
+   140   2    
   String string =
    141   
    "OS 
Info: Arch: " + Os.OS_ARCH + " Family: " + 
Os.OS_FAMILY + " Name: " + Os.OS_NAME + " Version: " +
    142   
    
Os.OS_VERSION;
    143   
    
-   144   0   if ( 
!info )
+   144   2   if ( !info 
)
    145   
    {
-   146   0   log.debug( string 
);
+   146   1    
   log.debug( string );
    147   
    }
    148   
    else
    149   
    {
-   150   0   log.info( string 
);
+   150   1    
   log.info( string );
    151   
    }
-   152   0   }
+   152   2   
}
    153   
    
    154   
@@ -310,10 +310,10 @@
    public boolean 
isAllowed()
    161   
    {
-   162   0   OperatingSystemProfileActivator activator = 
new 
OperatingSystemProfileActivator();
+   162   12   
OperatingSystemProfileActivator activator = new OperatingSyst

svn commit: r841560 [12/45] - in /websites/production/maven/content/enforcer: ./ enforcer-rules/ enforcer-rules/apidocs/org/apache/maven/plugins/enforcer/ enforcer-rules/apidocs/org/apache/maven/plugi

[olamy]

Added: 
websites/production/maven/content/enforcer/maven-enforcer-plugin/cobertura/org.apache.maven.plugins.enforcer.DisplayInfoMojo.html
==
--- 
websites/production/maven/content/enforcer/maven-enforcer-plugin/cobertura/org.apache.maven.plugins.enforcer.DisplayInfoMojo.html
 (added)
+++ 
websites/production/maven/content/enforcer/maven-enforcer-plugin/cobertura/org.apache.maven.plugins.enforcer.DisplayInfoMojo.html
 Mon Dec 10 22:08:37 2012
@@ -0,0 +1,214 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+
+
+Coverage Report
+
+
+
+
+Coverage Report - org.apache.maven.plugins.enforcer.DisplayInfoMojo
+ 
+
+  Classes in this File  Line Coverage  Branch Coverage  Complexity
+  DisplayInfoMojo0%0/14N/AN/A1.5;1.5
+
+
+ 
+
+   1   
+   package 
org.apache.maven.plugins.enforcer;
+   2   
+   
+   3   
+   /*
+   4   
+    * Licensed to 
the Apache Software Foundation (ASF) under one
+   5   
+    * or more 
contributor license agreements.  See the NOTICE file
+   6   
+    * distributed 
with this work for additional information
+   7   
+    * regarding 
copyright ownership.  The ASF licenses this file
+   8   
+    * to you under 
the Apache License, Version 2.0 (the
+   9   
+    * "License"); 
you may not use this file except in compliance
+   10   
+    * with the 
License.  You may obtain a copy of the License at
+   11   
+    
*
+   12   
+    *  
http://www.apache.org/licenses/LICENSE-2.0
+   13   
+    
*
+   14   
+    * Unless 
required by applicable law or agreed to in writing,
+   15   
+    * software 
distributed under the License is distributed on an
+   16   
+    * "AS IS" 
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   17   
+    * KIND, either 
express or implied.  See the License for the
+   18   
+    * specific 
language governing permissions and limitations
+   19   
+    * under the 
License.
+   20   
+    
*/
+   21   
+   
+   22   
+   import 
org.apache.commons.lang.SystemUtils;
+   23   
+   import 
org.apache.maven.execution.MavenSession;
+   24   
+   import 
org.apache.maven.execution.RuntimeInformation;
+   25   
+   import 
org.apache.maven.plugin.AbstractMojo;
+   26   
+   import 
org.apache.maven.plugin.MojoExecutionException;
+   27   
+   import 
org.apache.maven.plugins.annotations.Component;
+   28   
+   import 
org.apache.maven.plugins.annotations.Mojo;
+   29   
+   import 
org.apache.maven.project.MavenProject;
+   30   
+   import 
org.apache.maven.project.path.PathTranslator;
+   31   
+   import 
org.codehaus.plexus.PlexusConstants;
+   32   
+   import 
org.codehaus.plexus.PlexusContainer;
+   33   
+   import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+   34   
+   import 
org.codehaus.plexus.context.Context;
+   35   
+   import 
org.codehaus.plexus.context.ContextException;
+   36   
+   import 
org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+   37   
+   
+   38   
+   /**
+   39   
+    * This goal 
displays the current platform information.
+   40   
+    
*
+   41   
+    * @author 
Brian 
Fox
+   42   
+    * @version 
$Id: DisplayInfoMojo.java 1411846 2012-11-20 20:29:54Z hboutemy 
$
+   43   
+    
*/
+   44   
+   @Mojo( name = "display-info", threadSafe = true )
+   45   0   public class DisplayInfoMojo
+   46   
+   extends AbstractMojo
+   47   
+   implements Contextualizable
+   48   
+   {
+   49   
+   
+   50   
+   /**
+   51   
+    * Path 
Translator needed by the ExpressionEvaluator
+   52   
+    
*/
+   53   
+   @Component( role = 
PathTranslator.class )
+   54   
+   protected PathTranslator translator;
+   55   
+   
+   56   
+   /**
+   57   
+    * The 
MavenSession
+   58   
+    
*/
+   59   
+   @Component
+   60   
+   protected MavenSession session;
+   61   
+   
+   62   
+   /**
+   63   
+    * 
POM
+   64   
+    
*/
+   65   
+   @Component
+   66   
+   protected MavenProject project;
+   67   
+   
+   68   
+   // set by 
the contextualize method. Only way to get the
+   69   
+   // plugin's 
container in 2.0.x
+   70   
+   protected PlexusContainer container;
+   71   
+   
+   72   
+   public void contextualize ( 
Context context )
+   73   
+   throws ContextException
+   74   
+   {
+   75   0   container = (PlexusContainer) context.get( 
PlexusConstants.PLEXUS_KEY );
+   76   0   }
+   77   
+   
+   78   
+   /**
+   79   
+    * Entry 
point to the mojo
+   80   
+    
*/
+   81   
+   public void execute 
()
+   82   
+   throws MojoExecutionException
+   83   
+   {
+   84   
+   try
+   85   
+   {
+   86   0   EnforcerExpressionEvaluator evaluator = 
new EnforcerExpressionEvaluator( session, 
translator, project );
+   87   0   DefaultEn

svn commit: r841564 - in /websites/production/maven-doxia/content/doxia-tools: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/doxia/ apidocs/org/apache

[olamy]

Author: olamy
Date: Mon Dec 10 22:19:03 2012
New Revision: 841564

Log:
import doxia-tools content


[This commit notification would consist of 177 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r841566 - in /websites/production/maven/content/surefire: ./ maven-failsafe-plugin/ maven-failsafe-plugin/apidocs/ maven-failsafe-plugin/apidocs/org/ maven-failsafe-plugin/apidocs/org/apac

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 22:34:54 2012
New Revision: 841566

Log:
added missing files


[This commit notification would consist of 70 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1419847 - /maven/site/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Dec 10 22:42:03 2012
New Revision: 1419847

URL: http://svn.apache.org/viewvc?rev=1419847&view=rev
Log:
fix .htaccess filtering

Modified:
maven/site/trunk/pom.xml

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1419847&r1=1419846&r2=1419847&view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Mon Dec 10 22:42:03 2012
@@ -148,7 +148,7 @@
   
${project.reporting.outputDirectory}
   
 
-  src/site/filtered-resources
+  ${basedir}/content/filtered-resources
   true
 
   

svn commit: r841570 - in /websites/staging/maven/trunk/content: ./ .htaccess maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 22:43:54 2012
New Revision: 841570

Log:
Staging update by buildbot for maven

Added:
websites/staging/maven/trunk/content/.htaccess
Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 22:43:54 2012
@@ -1 +1 @@
-1419823
+1419847

Added: websites/staging/maven/trunk/content/.htaccess
==
--- websites/staging/maven/trunk/content/.htaccess (added)
+++ websites/staging/maven/trunk/content/.htaccess Mon Dec 10 22:43:54 2012
@@ -0,0 +1,73 @@
+ErrorDocument 404 /errors/404.html
+
+Redirect Permanent /release-notes.html 
http://maven.apache.org/release-notes-all.html
+
+Redirect /ref/current http://maven.apache.org/ref/3.0.4
+Redirect /ref/current-2.0.x http://maven.apache.org/ref/2.0.11
+
+Redirect Permanent /ant-tasks.html http://maven.apache.org/ant-tasks/index.html
+Redirect Permanent /ant-tasks-release-notes.html 
http://maven.apache.org/ant-tasks/release-notes.html
+
+Redirect Permanent /guides/mini/guide-ibiblio-upload.html 
http://maven.apache.org/guides/mini/guide-central-repository-upload.html
+Redirect Permanent /faq.html http://maven.apache.org/general.html
+Redirect Permanent /developers/release/pmc-release-process.html 
http://maven.apache.org/developers/release/releasing.html
+Redirect Permanent /development-process.html 
http://maven.apache.org/maven-1.x/development-process.html
+Redirect Permanent /welcome-to-new-committers.html 
http://maven.apache.org/developers/welcome-to-new-committers.html
+
+Redirect Permanent /plugins/maven-checkstyle-plugin/customize.html 
http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/custom-checker-config.html
+Redirect Permanent /plugins/maven-checkstyle-plugin/howto.html 
http://maven.apache.org/plugins/maven-checkstyle-plugin/usage.html
+Redirect Permanent /plugins/maven-checkstyle-plugin/tips.html 
http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html
+
+RedirectMatch ^/maven2/(.*)$ /$1
+RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1
+RedirectMatch ^/maven-1.x/reference/plugins/(.*)$ /maven-1.x/plugins/$1
+RedirectMatch ^/maven-aether-provider/(.*)$ /ref/3.0.4/maven-aether-provider/$1
+RedirectMatch ^/maven-artifact/(.*)$ /ref/3.0.4/maven-artifact/$1
+RedirectMatch ^/maven-compat/(.*)$ /ref/3.0.4/maven-compat/$1
+RedirectMatch ^/maven-core/(.*)$ /ref/3.0.4/maven-core/$1
+RedirectMatch ^/maven-embedder/(.*)$ /ref/3.0.4/maven-embedder/$1
+RedirectMatch ^/maven-model/(.*)$ /ref/3.0.4/maven-model/$1
+RedirectMatch ^/maven-model-builder/(.*)$ /ref/3.0.4/maven-model-builder/$1
+RedirectMatch ^/maven-plugin-api/(.*)$ /ref/3.0.4/maven-plugin-api/$1
+RedirectMatch ^/maven-repository-metadata/(.*)$ 
/ref/3.0.4/maven-repository-metadata/$1
+RedirectMatch ^/maven-settings/(.*)$ /ref/3.0.4/maven-settings/$1
+RedirectMatch ^/maven-settings-builder/(.*)$ 
/ref/3.0.4/maven-settings-builder/$1
+RedirectMatch ^/maven-artifact-manager/(.*)$ 
/ref/2.0.11/maven-artifact-manager/$1
+RedirectMatch ^/maven-artifact-test/(.*)$ /ref/2.0.11/maven-artifact-test/$1
+RedirectMatch ^/maven-error-diagnostics/(.*)$ 
/ref/2.0.11/maven-error-diagnostics/$1
+RedirectMatch ^/maven-monitor/(.*)$ /ref/2.0.11/maven-monitor/$1
+RedirectMatch ^/maven-plugin-descriptor/(.*)$ 
/ref/2.0.11/maven-plugin-descriptor/$1
+RedirectMatch ^/maven-plugin-parameter-documenter/(.*)$ 
/ref/2.0.11/maven-plugin-parameter-documenter/$1
+RedirectMatch ^/maven-plugin-registry/(.*)$ 
/ref/2.0.11/maven-plugin-registry/$1
+RedirectMatch ^/maven-profile/(.*)$ /ref/2.0.11/maven-profile/$1
+RedirectMatch ^/maven-project/(.*)$ /ref/2.0.11/maven-project/$1
+RedirectMatch ^/maven-reporting/(.*)$ /ref/2.0.11/maven-reporting/$1
+RedirectMatch ^/maven-script/(.*)$ /ref/2.0.11/maven-script/$1
+RedirectMatch ^/maven-toolchain/(.*)$ /ref/2.0.11/maven-toolchain/$1
+RedirectMatch ^/maven-1.x/plugins-sandbox/(.*)$ /maven-1.x/plugins/$1
+
+RedirectMatch permanent ^/repository-manager/(.*)$ http://archiva.apache.org/$1
+RedirectMatch permanent ^/archiva(.*)$ http://archiva.apache.org$1
+RedirectMatch permanent ^/continuum(.*)$ http://continuum.apache.org$1
+RedirectMatch permanent ^/maven-archetype/(.*)$ /archetype/$1
+RedirectMatch permanent ^/plugins/maven-archetype-plugin/(.*)$ 
http://maven.apache.org/archetype/maven-archetype-plugin/$1
+RedirectMatch permanent ^/plugins/maven-enforcer-plugin/(.*)$ 
http://maven.apache.org/enforcer/maven-enforcer-plugin/$1
+RedirectMatch permanent ^/plugins/maven-scm-plugin/(.*)$ 
http://maven.apache.org/scm/maven-scm-plugin/$1
+RedirectMatch permanent ^/plugins/maven-plugin-plugin/(.*)$ 
http://maven.apache.org/plugin-tools/maven-plugin-plugin/$1
+#RedirectMa

svn commit: r841573 - in /websites/production/maven/content/plugins: maven-invoker-plugin-1.8/ tmp/

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 22:49:41 2012
New Revision: 841573

Log:
fixed staging location step 1

Added:
websites/production/maven/content/plugins/tmp/
  - copied from r841572, 
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/
Removed:
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/

svn commit: r841574 - in /websites/production/maven/content/plugins: maven-invoker-plugin-1.8/ tmp/

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 22:50:13 2012
New Revision: 841574

Log:
fixed staging location step 2

Added:
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/
  - copied from r841573, 
websites/production/maven/content/plugins/tmp/maven-invoker-plugin/
Removed:
websites/production/maven/content/plugins/tmp/

svn commit: r841575 - in /websites/production/maven/content/plugins: maven-invoker-plugin-1.8/ tmp/

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 22:51:12 2012
New Revision: 841575

Log:
fixed staging location step 1

Added:
websites/production/maven/content/plugins/tmp/
  - copied from r841574, 
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/
Removed:
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/

svn commit: r1419857 - /maven/site/trunk/content/apt/developers/publish-website.apt

[olamy]

Author: olamy
Date: Mon Dec 10 22:54:31 2012
New Revision: 1419857

URL: http://svn.apache.org/viewvc?rev=1419857&view=rev
Log:
no need of a new page modify the current one

Removed:
maven/site/trunk/content/apt/developers/publish-website.apt

svn commit: r841576 - in /websites/staging/maven/trunk/content: ./ developers/publish-website.html maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 22:56:19 2012
New Revision: 841576

Log:
Staging update by buildbot for maven

Removed:
websites/staging/maven/trunk/content/developers/publish-website.html
Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 22:56:19 2012
@@ -1 +1 @@
-1419847
+1419857

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==
Binary files - no diff available.

svn commit: r841577 - in /websites/production/maven/content/plugins: maven-invoker-plugin-1.8/ tmp/

[hboutemy]

Author: hboutemy
Date: Mon Dec 10 22:56:25 2012
New Revision: 841577

Log:
fixed staging location step 2

Added:
websites/production/maven/content/plugins/maven-invoker-plugin-1.8/
  - copied from r841575, websites/production/maven/content/plugins/tmp/
Removed:
websites/production/maven/content/plugins/tmp/

svn commit: r1419862 - /maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt

[olamy]

Author: olamy
Date: Mon Dec 10 23:07:44 2012
New Revision: 1419862

URL: http://svn.apache.org/viewvc?rev=1419862&view=rev
Log:
fix documentation for publishing maven website

Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt

Modified: 
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt?rev=1419862&r1=1419861&r2=1419862&view=diff
==
--- maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt 
(original)
+++ maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt 
Mon Dec 10 23:07:44 2012
@@ -30,6 +30,16 @@ Introduction
 
  This document gives step-by-step instructions for deploying the Maven website 
{{{http://maven.apache.org}http://maven.apache.org}}.
 
+ Since 10th Decemeber 2012, the main website use CMS mechanism. (see 
{{{http://cms.apache.org}http://cms.apache.org}}).
+
+ You can edit pages in two ways:
+
+ * use the CMS UI.
+
+ * checkout the content locally and modify manually.
+
+ []
+
 Prerequisite
 
  Be sure that:
@@ -37,36 +47,37 @@ Prerequisite
  * you have all Maven servers defined in your <<>>. For more 
information, please refer to
  {{{../committer-settings.html}Committer settings}}.
 
-Deploy Maven Website
 
- [[1]] Do a fresh check out of the Maven site, for example:
+* Modify Maven Website with CMS UI
 
-+-+
-$ svn checkout https://svn.apache.org/repos/asf/maven/site site
-+-+
+  * Go to {{{http://cms.apache.org/maven}http://cms.apache.org/maven}}.
 
- [[2]] Execute the site goal
+  * Click link "Get maven Working Copy"
 
-+-+
-site$ mvn site 
-+-+
+  * Now navigate to the content you want to modify
 
- [[3]] Verify the documentation before deploying
+  * Once you have modify the content, you can now commit with the button 
"Submit".
 
- You could also use the  goal of the Maven Site Plugin to verify the 
site output. For instance:
+  []
+
+* Modify Maven Website with a local copy
+
+ [[1]] Do a fresh check out of the Maven site, for example:
 
 +-+
-site$ mvn site:stage -DstagingDirectory=/tmp/maven-website
+$ svn checkout https://svn.apache.org/repos/asf/maven/site site
 +-+
 
- [[4]] Deploy to people.apache.org
+ [[2]] Execute the site goal
 
 +-+
-site$ mvn site-deploy 
+site$ mvn site 
 +-+
 
- It will copy the site to the  which is currently defined in 
the <<>> as 
+ [[3]] Verify the documentation before committing
 
- <> It will 
{{{http://www.apache.org/dev/release-publishing.html#sync-delay}take an hour or 
so to sync}}.
+Publish content
 
- []
+  * Verify staging content has been build with buildbot job 
{{{http://ci.apache.org/builders/maven-site-staging}http://ci.apache.org/builders/maven-site-staging}}
+
+  * Build finish, publish modifications using 
{{{http://cms.apache.org/maven/publish}http://cms.apache.org/maven/publish}}

svn commit: r1419863 - /maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt

[olamy]

Author: olamy
Date: Mon Dec 10 23:09:32 2012
New Revision: 1419863

URL: http://svn.apache.org/viewvc?rev=1419863&view=rev
Log:
cms use https

Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt

Modified: 
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt?rev=1419863&r1=1419862&r2=1419863&view=diff
==
--- maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt 
(original)
+++ maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt 
Mon Dec 10 23:09:32 2012
@@ -30,7 +30,7 @@ Introduction
 
  This document gives step-by-step instructions for deploying the Maven website 
{{{http://maven.apache.org}http://maven.apache.org}}.
 
- Since 10th Decemeber 2012, the main website use CMS mechanism. (see 
{{{http://cms.apache.org}http://cms.apache.org}}).
+ Since 10th Decemeber 2012, the main website use CMS mechanism. (see 
{{{https://cms.apache.org}https://cms.apache.org}}).
 
  You can edit pages in two ways:
 
@@ -50,7 +50,7 @@ Prerequisite
 
 * Modify Maven Website with CMS UI
 
-  * Go to {{{http://cms.apache.org/maven}http://cms.apache.org/maven}}.
+  * Go to {{{https://cms.apache.org/maven}https://cms.apache.org/maven}}.
 
   * Click link "Get maven Working Copy"
 
@@ -80,4 +80,4 @@ Publish content
 
   * Verify staging content has been build with buildbot job 
{{{http://ci.apache.org/builders/maven-site-staging}http://ci.apache.org/builders/maven-site-staging}}
 
-  * Build finish, publish modifications using 
{{{http://cms.apache.org/maven/publish}http://cms.apache.org/maven/publish}}
+  * Build finish, publish modifications using 
{{{https://cms.apache.org/maven/publish}https://cms.apache.org/maven/publish}}

svn commit: r841583 - in /websites/staging/maven/trunk/content: ./ developers/website/deploy-maven-website.html maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 23:09:32 2012
New Revision: 841583

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)

websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 23:09:32 2012
@@ -1 +1 @@
-1419857
+1419862

Modified: 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
==
--- 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
 (original)
+++ 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
 Mon Dec 10 23:09:32 2012
@@ -229,7 +229,7 @@
 
 
   
-IntroductionThis document gives step-by-step instructions 
for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.PrerequisiteBe sure 
that:you have all Maven servers defined in your 
settings.xml. For more information, please refer to Committer settings.Deploy Maven WebsiteDo a fresh check out of the Maven site, for example:$ svn checkout https://svn.apache.org/repos/asf/maven/site 
siteExecute the site goalsite$ 
mvn site Verify the documentation before deployingYou 
could also use the stage goal of the Maven Site Plugin to verify the site output. For 
instance:site$ mvn site:stage 
-DstagingDirectory=/tmp/maven-websiteDeploy to 
people.apache.orgsite$ mvn site-deploy 
It will copy the site to the site.deploy.url which is 
currently defined in the pom.xml as 
scp://people.apache.org/www/maven.apache.org/Note: It will 
http://www.apache.org/dev/release-publishing.html#sync-delay";>take an 
hour or so to sync.
+IntroductionThis document gives step-by-step instructions 
for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.Since 10th 
Decemeber 2012, the main website use CMS mechanism. (see http://cms.apache.org";>http://cms.apache.org).You can edit 
pages in two ways:use the CMS UI.checkout the content 
locally and modify manually.PrerequisiteBe sure 
that:you have all Maven servers defined in your 
settings.xml. For more information, please refer to Committer settings.Modify Maven Website with CMS UIGo to http://cms.apac
 he.org/maven">http://cms.apache.org/maven.Click link "Get 
maven Working Copy"Now navigate to the content you want to 
modifyOnce you have modify the content, you can now commit with the 
button "Submit".Modify Maven 
Website with a local copyDo a fresh check out of the Maven site, 
for example:$ svn checkout 
https://svn.apache.org/repos/asf/maven/site siteExecute 
the site goalsite$ mvn site 
Verify the documentation before 
committingPublish contentVerify staging content has been build 
with buildbot job http://ci.apache.org/builders/maven-site-staging";>http://ci.apache.org/builders/mav
 en-site-stagingBuild finish, publish modifications using http://cms.apache.org/maven/publish";>http://cms.apache.org/maven/publish
   
 
 

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==
Binary files - no diff available.

svn commit: r841585 - in /websites/staging/maven/trunk/content: ./ developers/website/deploy-maven-website.html maven-site-1.0-site.jar

[buildbot]

Author: buildbot
Date: Mon Dec 10 23:11:20 2012
New Revision: 841585

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)

websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 23:11:20 2012
@@ -1 +1 @@
-1419862
+1419863

Modified: 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
==
--- 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
 (original)
+++ 
websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
 Mon Dec 10 23:11:20 2012
@@ -229,7 +229,7 @@
 
 
   
-IntroductionThis document gives step-by-step instructions 
for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.Since 10th 
Decemeber 2012, the main website use CMS mechanism. (see http://cms.apache.org";>http://cms.apache.org).You can edit 
pages in two ways:use the CMS UI.checkout the content 
locally and modify manually.PrerequisiteBe sure 
that:you have all Maven servers defined in your 
settings.xml. For more information, please refer to Committer settings.Modify Maven Website with CMS UIGo to http://cms.apac
 he.org/maven">http://cms.apache.org/maven.Click link "Get 
maven Working Copy"Now navigate to the content you want to 
modifyOnce you have modify the content, you can now commit with the 
button "Submit".Modify Maven 
Website with a local copyDo a fresh check out of the Maven site, 
for example:$ svn checkout 
https://svn.apache.org/repos/asf/maven/site siteExecute 
the site goalsite$ mvn site 
Verify the documentation before 
committingPublish contentVerify staging content has been build 
with buildbot job http://ci.apache.org/builders/maven-site-staging";>http://ci.apache.org/builders/mav
 en-site-stagingBuild finish, publish modifications using http://cms.apache.org/maven/publish";>http://cms.apache.org/maven/publish
+IntroductionThis document gives step-by-step instructions 
for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.Since 10th 
Decemeber 2012, the main website use CMS mechanism. (see https://cms.apache.org";>https://cms.apache.org).You can edit 
pages in two ways:use the CMS UI.checkout the content 
locally and modify manually.PrerequisiteBe sure 
that:you have all Maven servers defined in your 
settings.xml. For more information, please refer to Committer settings.Modify Maven Website with CMS UIGo to https://cms.a
 pache.org/maven">https://cms.apache.org/maven.Click link 
"Get maven Working Copy"Now navigate to the content you want 
to modifyOnce you have modify the content, you can now commit with the 
button "Submit".Modify Maven 
Website with a local copyDo a fresh check out of the Maven site, 
for example:$ svn checkout 
https://svn.apache.org/repos/asf/maven/site siteExecute 
the site goalsite$ mvn site 
Verify the documentation before 
committingPublish contentVerify staging content has been build 
with buildbot job http://ci.apache.org/builders/maven-site-staging";>http://ci.apache.org/builders
 /maven-site-stagingBuild finish, publish modifications using https://cms.apache.org/maven/publish";>https://cms.apache.org/maven/publish
   
 
 

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==
Binary files - no diff available.