svn commit: r291895 - in /maven/components/trunk/maven-plugins/maven-plugin-plugin: pom.xml src/main/java/org/apache/maven/plugin/plugin/PluginReport.java

[vsiveton]

Author: vsiveton
Date: Tue Sep 27 03:41:19 2005
New Revision: 291895

URL: http://svn.apache.org/viewcvs?rev=291895view=rev
Log:
For MNG-706 comments: upgraded org.apache.maven.reporting:maven-reporting-impl 
to 2.0-beta-3-SNAPSHOT (required for new features in 
AbstractMavenReportRenderer class, see revision 291668); Updated renderBody() 
to handle correctly relative path and javadoc plugin as HTML; Added 
documentation.

Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java

Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml?rev=291895r1=291894r2=291895view=diff
==
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml Tue Sep 27 
03:41:19 2005
@@ -10,6 +10,17 @@
   nameMaven PLUGIN Plugin/name
   version2.0-beta-3-SNAPSHOT/version
   inceptionYear2001/inceptionYear
+  developers
+developer
+  idvsiveton/id
+  nameVincent Siveton/name
+  email[EMAIL PROTECTED]/email
+  roles
+roleJava Developer/role
+  /roles
+  timezone-5/timezone
+/developer
+  /developers
   dependencies
 dependency
   groupIdorg.apache.maven/groupId
@@ -35,7 +46,7 @@
 dependency
   groupIdorg.apache.maven.reporting/groupId
   artifactIdmaven-reporting-impl/artifactId
-  version2.0-beta-1/version
+  version2.0-beta-3-SNAPSHOT/version
 /dependency
 dependency
   groupIdorg.apache.maven/groupId

Modified: 
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=291895r1=291894r2=291895view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
 Tue Sep 27 03:41:19 2005
@@ -42,19 +42,24 @@
  * Generates the Plugin's documentation report.
  *
  * @author a href=[EMAIL PROTECTED]Stephane Nicoll/a
- * @version $Id: EarMojo.java 267433 2005-09-03 07:34:07Z brett $
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
+ * @version $Id $
  * @goal report
  */
 public class PluginReport
 extends AbstractMavenReport
 {
 /**
+ * Report output directory.
+ *
  * @parameter expression=${project.build.directory}/generated-site/xdoc
  * @required
  */
 private String outputDirectory;
 
 /**
+ * Doxia Site Renderer.
+ *
  * @parameter 
expression=${component.org.codehaus.doxia.site.renderer.SiteRenderer}
  * @required
  * @readonly
@@ -62,6 +67,8 @@
 private SiteRenderer siteRenderer;
 
 /**
+ * The Maven Project.
+ *
  * @parameter expression=${project}
  * @required
  * @readonly
@@ -69,26 +76,40 @@
 private MavenProject project;
 
 /**
+ * Mojo scanner tools.
+ *
  * @parameter 
expression=${component.org.apache.maven.tools.plugin.scanner.MojoScanner}
  * @required
  */
 protected MojoScanner mojoScanner;
 
+/**
+ * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
+ */
 protected SiteRenderer getSiteRenderer()
 {
 return siteRenderer;
 }
 
+/**
+ * @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
+ */
 protected String getOutputDirectory()
 {
 return outputDirectory;
 }
 
+/**
+ * @see org.apache.maven.reporting.AbstractMavenReport#getProject()
+ */
 protected MavenProject getProject()
 {
 return project;
 }
 
+/**
+ * @see 
org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
+ */
 protected void executeReport( Locale locale )
 throws MavenReportException
 {
@@ -135,16 +156,25 @@
 }
 }
 
+/**
+ * @see 
org.apache.maven.reporting.MavenReport#getDescription(java.util.Locale)
+ */
 public String getDescription( Locale locale )
 {
 return getBundle( locale ).getString( report.plugin.description );
 }
 
+/**
+ * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
+ */
 public String getName( Locale locale )
 {
 return getBundle( locale ).getString( report.plugin.name );
 }
 
+/**
+ * @see

svn commit: r291922 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt: howto.apt introduction.apt

[vsiveton]

Author: vsiveton
Date: Tue Sep 27 05:32:25 2005
New Revision: 291922

URL: http://svn.apache.org/viewcvs?rev=291922view=rev
Log:
Corrected EOL for apt files

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt?rev=291922r1=291921r2=291922view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
 Tue Sep 27 05:32:25 2005
@@ -1,5 +1,5 @@
  --

- Maven 2 Project Info Report Plugin 

+ Maven 2 Project Info Report Plugin

  --

  Johnny R. Ruiz III

  [EMAIL PROTECTED]

@@ -8,15 +8,15 @@
 

 How to Use

 

- This plugin consists of several reports that you can run selectively, 
individually or even run all of them.  Please see below for instructions 

- on how to configure your pom.xml to do this.  

- 

+ This plugin consists of several reports that you can run selectively, 
individually or even run all of them.  Please see below for instructions

+ on how to configure your pom.xml to do this.

+

 

 *Run All Reports

 

- To include all Project Info Reports in your project, you must configure your 
pom.xml.  

+ To include all Project Info Reports in your project, you must configure your 
pom.xml.

  Use m2 site:site to generate the configured reports.

- 

+

 ---

 project

...

@@ -36,11 +36,11 @@
 

 *Run Selective Reports

 

- To run the reports selectively, you can configure it to include only the 
reports that you prefer. 

+ To run the reports selectively, you can configure it to include only the 
reports that you prefer.

  Use m2 site:site to generate the selected reports.

-  

+

 ---

-  

+

   project

  ...

 reporting

@@ -75,8 +75,8 @@
  How to run the reports directly without configuring anything from the pom.xml?

 

 
*-+--+

-|Report Name  | Command Line   
  |  

-| |
  |

+|Report Name  | Command Line   
  |

+| |
  |

 
*-+--+

 |Dependencies Report  | m2 project-info-reports:dependencies   
  |

 
*-+--+

@@ -92,10 +92,10 @@
 
*-+--+

 |License  | m2 project-info-reports:license
  |

 
*-+--+

-  

-  

-  

+

+

+

   For full documentation, click {{{index.html}here}}.

- 

+

 

 


Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt?rev=291922r1=291921r2=291922view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt
 Tue Sep 27 05:32:25 2005
@@ -1,5 +1,5 @@
  --

- Maven 2 Project Info Reports Plugin 

+ Maven 2 Project Info Reports Plugin

  --

  Johnny R. Ruiz III

  [EMAIL PROTECTED]

@@ -9,10 +9,10 @@
 Introduction

 

  This is a plugin that generates reports information about the project.  The 
reports being generated are as follows:

- 

+

 
*-+---+

-|Report Name  | Description
   |  

-| |
   |

+|Report Name  | Description

svn commit: r291924 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt: howto.apt introduction.apt

[vsiveton]

Author: vsiveton
Date: Tue Sep 27 05:39:19 2005
New Revision: 291924

URL: http://svn.apache.org/viewcvs?rev=291924view=rev
Log:
Corrected EOL for apt files. Thanks Brett.

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
   (contents, props changed)

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/introduction.apt
   (contents, props changed)

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt?rev=291924r1=291923r2=291924view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/site/apt/howto.apt
 Tue Sep 27 05:39:19 2005
@@ -1,101 +1,101 @@
- --

- Maven 2 Project Info Report Plugin

- --

- Johnny R. Ruiz III

- [EMAIL PROTECTED]

- --

- September 20, 2005

-

-How to Use

-

- This plugin consists of several reports that you can run selectively, 
individually or even run all of them.  Please see below for instructions

- on how to configure your pom.xml to do this.

-

-

-*Run All Reports

-

- To include all Project Info Reports in your project, you must configure your 
pom.xml.

- Use m2 site:site to generate the configured reports.

-



-project

-   ...

-  reporting

- ...

-plugins

-plugin

-groupIdorg.apache.maven.plugins/groupId

-artifactIdmaven-project-info-reports-plugin/artifactId

- /plugin

- /plugins

- ...

-  reporting

-   ...

-/project



-

-*Run Selective Reports

-

- To run the reports selectively, you can configure it to include only the 
reports that you prefer.

- Use m2 site:site to generate the selected reports.

-



-

-  project

- ...

-reporting

-   ...

-plugins

-  plugin

-  groupIdorg.apache.maven.plugins/groupId

-  artifactIdmaven-project-info-reports-plugin/artifactId

-  reportSets

- reportSet

-reports

-   reportdependencies/report

-   reportproject-team/report

-   reportmailing-list/report

-   reportcim/report

-   reportissue-tracking/report

-   reportlicense/report

-   reportscm/report

-/reports

- /reportSet

-  /reportSets

-  /plugin

-/plugins

-   ...

-reporting

- ...

-  /project



-

-*Run Individual Report

-

- How to run the reports directly without configuring anything from the pom.xml?

-

-*-+--+

-|Report Name  | Command Line   
  |

-| |
  |

-*-+--+

-|Dependencies Report  | m2 project-info-reports:dependencies   
  |

-*-+--+

-|Mailing Lists| m2 project-info-reports:mailing-list   
  |

-*-+--+

-|Continous Integration| m2 project-info-reports:cim
  |

-*-+--+

-|Source Repository| m2 project-info-reports:scm
  |

-*-+--+

-|Issue Tracking   | m2 project-info-reports:issue-tracking 
  |

-*-+--+

-|Project Team | m2 project-info-reports:project-team   
  |

-*-+--+

-|License  | m2 project-info-reports:license
  |

-*-+--+

-

-

-

-  For full documentation, click {{{index.html}here}}.

-

-

-

+ --
+ Maven 2 Project Info Report Plugin
+ --
+ Johnny R. Ruiz III
+ [EMAIL PROTECTED]
+ --
+ September 20, 2005
+
+How to Use
+
+ This plugin consists of several reports

svn commit: r279769 - in /maven/components/trunk/maven-plugins/maven-checkstyle-plugin: pom.xml src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java src/main/resources/log4j.properties

[vsiveton]

Author: vsiveton
Date: Fri Sep  9 06:31:51 2005
New Revision: 279769

URL: http://svn.apache.org/viewcvs?rev=279769view=rev
Log:
Corrected getConfigFile() by specifying sun as default config file; added 
log4j.properties to remove warn for org.apache.commons.beanutils.BeanUtils; 
formated code; added copyright to pom.xml

Added:

maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/resources/log4j.properties
   (with props)
Modified:
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml?rev=279769r1=279768r2=279769view=diff
==
--- maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml 
(original)
+++ maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml Fri 
Sep  9 06:31:51 2005
@@ -1,4 +1,25 @@
-project
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ --
+
+ project xmlns=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;
   modelVersion4.0.0/modelVersion
   parent
 artifactIdmaven-plugin-parent/artifactId
@@ -52,4 +73,16 @@
   version1.0.3/version
 /dependency
   /dependencies
+  developers
+developer
+  idvsiveton/id
+  nameVincent Siveton/name
+  email[EMAIL PROTECTED]/email
+  organizationApache Software Foundation/organization
+  roles
+roleJava Developer/role
+  /roles
+  timezone-5/timezone
+/developer
+  /developers
 /project

Modified: 
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=279769r1=279768r2=279769view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
 Fri Sep  9 06:31:51 2005
@@ -47,11 +47,11 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 
-
 /**
  * @goal checkstyle
  *
  * @author a href=mailto:[EMAIL PROTECTED]Emmanuel Venisse/a
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
  * @version $Id: DependenciesReport.java,v 1.2 2005/02/23 00:08:02 brett Exp $
  */
 public class CheckstyleReport
@@ -64,7 +64,7 @@
  * @required
  */
 private String outputDirectory;
-
+
 /**
  * Specifies the names filter of the source files to be used for checkstyle
  *
@@ -72,14 +72,14 @@
  * @required
  */
 private String includes;
-
+
 /**
  * Specifies the names filter of the source files to be excluded for 
checkstyle
- * 
+ *
  * @parameter
  */
 private String excludes;
-
+
 /**
  * Specifies what predefined check set to use. Available sets are
  * sun (for the Sun coding conventions), turbine, and avalon.
@@ -88,21 +88,21 @@
  * @parameter default-value=sun
  */
 private String format;
-
+
 /**
  * Specifies the location of the checkstyle properties that will be used 
to check the source.
  *
  * @parameter
  */
 private File propertiesFile;
-
+
 /**
  * Specifies the URL of the checkstyle properties that will be used to 
check the source.
  *
  * @parameter
  */
 private URL propertiesURL;
-
+
 /**
  * Specifies the location of the License file (a.k.a. the header file) 
that is used by Checkstyle
  * to verify that source code has the correct copyright.
@@ -117,7 +117,7 @@
  * @parameter expression=${project.build.directory}/checkstyle-cachefile

svn commit: r240444 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

[vsiveton]

Author: vsiveton
Date: Sat Aug 27 11:16:19 2005
New Revision: 240444

URL: http://svn.apache.org/viewcvs?rev=240444view=rev
Log:
Cleaning up the code a bit: replace static array of all reports file name 
generated by Maven by a list (more dynamic); the first token in the locales 
variable is the default locale (set in the VM); create 
createDuplicateExceptionMsg() to handle the exception msg when some files are 
duplicated; move code to generate reports in a new method called 
generateReportsPages(); improve logging.

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=240444r1=240443r2=240444view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Sat Aug 27 11:16:19 2005
@@ -77,10 +77,9 @@
 private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + 
/maven-site.vm;
 
 /**
- * OutputName of all project info report files generated by Maven
+ * OutputName of all reports files generated by Maven
  */
-private static final String[] PROJECT_INFO_FILES = new 
String[]{integration, dependencies, issue-tracking,
-license, mail-lists, source-repository, team-list};
+private static List generatedReportsFileName = new ArrayList();
 
 /**
  * Patterns which should be excluded by default.
@@ -160,7 +159,7 @@
  * default-value=ISO-8859-1
  */
 private String outputEncoding;
-
+
 /**
  * @parameter 
expression=${component.org.codehaus.plexus.siterenderer.Renderer}
  * @required
@@ -259,14 +258,19 @@
 }
 else
 {
+// The first token is the default locale
 StringTokenizer st = new StringTokenizer( locales, , );
 
 while ( st.hasMoreTokens() )
 {
 localesList.add( new Locale( st.nextToken().trim() ) );
 }
+
+defaultLocale = (Locale) localesList.get( 0 );
 }
 
+Locale.setDefault( defaultLocale );
+
 for ( Iterator iterator = localesList.iterator(); 
iterator.hasNext(); )
 {
 Locale locale = (Locale) iterator.next();
@@ -279,84 +283,18 @@
 localeOutputDirectory.mkdirs();
 }
 
-//Generate reports
-if ( reports != null )
-{
-for ( Iterator j = reports.iterator(); j.hasNext(); )
-{
-MavenReport report = (MavenReport) j.next();
-
-getLog().info( Generate \ + report.getName( locale 
) + \ report. );
-
-report.setReportOutputDirectory( localeOutputDirectory 
);
-
-String outputFileName = report.getOutputName() + 
.html;
-
-SiteRendererSink sink = siteRenderer.createSink( new 
File( siteDirectory ), outputFileName,
- 
getSiteDescriptor( reports, locale ) );
-
-report.generate( sink, locale );
-
-if ( !report.isExternalReport() )
-{
-File outputFile = new File( localeOutputDirectory, 
outputFileName );
-
-if ( !outputFile.getParentFile().exists() )
-{
-outputFile.getParentFile().mkdirs();
-}
-
-siteRenderer.generateDocument( new 
OutputStreamWriter( new FileOutputStream( outputFile ),
-   
outputEncoding ), template,
-   attributes, sink, 
locale );
-}
-}
-}
-
-//Generate overview pages
-if ( projectInfos.size()  0 )
-{
-try
-{
-generateProjectInfoPage( getSiteDescriptor( reports, 
locale ), locale );
-}
-catch ( Exception e )
-{
-throw new MojoExecutionException( An error is 
occurred in project info page generation., e );
-}
-}
-
-if ( projectReports.size()  0

svn commit: r240337 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

[vsiveton]

Author: vsiveton
Date: Fri Aug 26 13:40:17 2005
New Revision: 240337

URL: http://svn.apache.org/viewcvs?rev=240337view=rev
Log:
Added a test in the banner macro to remove Velocity error (RHS of #set 
statement is null. Context will not be modified)

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=240337r1=240336r2=240337view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Fri Aug 26 13:40:17 2005
@@ -1,4 +1,5 @@
 #macro ( banner $id )
+  #if ( $siteDescriptor.getChild( $id ) )
 #set ( $e = $siteDescriptor.getChild( $id ) )
 #if( $e.getChild( href ) )
 #set ( $link = $e.getChild( href ).getValue() )
@@ -24,7 +25,7 @@
 #else
 /span
 #end
-
+  #end  
 #end
 
 #macro ( links )



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r239599 - /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

[vsiveton]

Author: vsiveton
Date: Wed Aug 24 03:56:50 2005
New Revision: 239599

URL: http://svn.apache.org/viewcvs?rev=239599view=rev
Log:
MNG-754: Added artifact information in the exception

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=239599r1=239598r2=239599view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
 Wed Aug 24 03:56:50 2005
@@ -233,8 +233,9 @@
 }
 catch ( ProjectBuildingException e )
 {
-throw new IllegalArgumentException(
-Can't find a valid Maven project in the repository 
for the artifact [ + artifact + ]. );
+throw new IllegalArgumentException( Can't find a valid 
Maven project in the repository for the artifact [
++ 
artifact.getGroupId() + : + artifact.getArtifactId()
++ : + 
artifact.getVersion() + ]. );
 }
 
 tableRow( new String[]{artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion(),
@@ -275,8 +276,10 @@
 }
 catch ( ProjectBuildingException e )
 {
-throw new IllegalArgumentException(
-Can't find a valid Maven project in the 
repository for the artifact [ + artifact + ]. );
+throw new IllegalArgumentException( Can't find a 
valid Maven project in the repository for the artifact [
++ 
artifact.getGroupId() + :
++ 
artifact.getArtifactId() + :
++ 
artifact.getVersion() + ]. );
 }
 tableRow( new String[]{artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion(),
 artifactProject.getDescription(),



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r232989 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/main: java/org/apache/maven/doxia/DoxiaMojo.java resources/default-site.xml

[vsiveton]

Author: vsiveton
Date: Tue Aug 16 05:47:25 2005
New Revision: 232989

URL: http://svn.apache.org/viewcvs?rev=232989view=rev
Log:
MNG-722: Applied changes proposed by Incze Lajos, ie using 
OutputStreamWriter(FileOutputStream(...), outputEncoding) instead of 
FileWriter(...). Added also the outputEncoding parameter in the 
default-site.xml.

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=232989r1=232988r2=232989view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Tue Aug 16 05:47:25 2005
@@ -41,11 +41,11 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -306,8 +306,9 @@
 outputFile.getParentFile().mkdirs();
 }
 
-siteRenderer.generateDocument( new FileWriter( 
outputFile ), template, attributes, sink,
-   locale );
+siteRenderer.generateDocument( new 
OutputStreamWriter( new FileOutputStream( outputFile ),
+   
outputEncoding ), template,
+   attributes, sink, 
locale );
 }
 }
 }
@@ -663,6 +664,8 @@
 
 Map props = new HashMap();
 
+props.put( outputEncoding, outputEncoding );
+
 if ( reports != null )
 {
 props.put( reports, getReportsMenu( locale ) );
@@ -753,7 +756,9 @@
 
 sink.close();
 
-siteRenderer.generateDocument( new FileWriter( new File( 
getOuputDirectory( locale ), outputFileName ) ),
+File outputFile = new File( getOuputDirectory( locale ), 
outputFileName );
+
+siteRenderer.generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ), outputEncoding ),
template, attributes, sink, locale );
 }
 
@@ -831,8 +836,10 @@
 
 sink.close();
 
-siteRenderer.generateDocument( new FileWriter( new File( 
getOuputDirectory( locale ), outputFileName ) ),
-   template, attributes, sink, locale );
+File outputFile = new File( getOuputDirectory( locale ), 
outputFileName );
+
+siteRenderer.generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ) ), template,
+   attributes, sink, locale );
 }
 
 private void generateProjectReportsPage( InputStream siteDescriptor, 
Locale locale )
@@ -905,8 +912,10 @@
 
 sink.body_();
 
-siteRenderer.generateDocument( new FileWriter( new File( 
getOuputDirectory( locale ), outputFileName ) ),
-   template, attributes, sink, locale );
+File outputFile = new File( getOuputDirectory( locale ), 
outputFileName );
+
+siteRenderer.generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ) ), template,
+   attributes, sink, locale );
 }
 
 private void copyResources( File outputDir )

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml?rev=232989r1=232988r2=232989view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/default-site.xml
 Tue Aug 16 05:47:25 2005
@@ -1,4 +1,4 @@
-?xml version=1.0 encoding=ISO-8859-1?
+?xml version=1.0 encoding=${outputEncoding}?
 project name=${project.name}
   bannerLeft
 name${project.name}/name



-
To unsubscribe, e-mail: [EMAIL PROTECTED

svn commit: r231433 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/main: java/org/apache/maven/doxia/DoxiaMojo.java resources/org/apache/maven/doxia/maven-site.vm

[vsiveton]

Author: vsiveton
Date: Thu Aug 11 05:28:52 2005
New Revision: 231433

URL: http://svn.apache.org/viewcvs?rev=231433view=rev
Log:
MNG-722: added a new outputEncoding parameter in the DoxiaMojo class. Updated 
the maven-site.vm

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=231433r1=231432r2=231433view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Thu Aug 11 05:28:52 2005
@@ -156,6 +156,12 @@
 private boolean addModules;
 
 /**
+ * @parameter expression=${outputEncoding}
+ * default-value=ISO-8859-1
+ */
+private String outputEncoding;
+
+/**
  * @parameter 
expression=${component.org.codehaus.plexus.siterenderer.Renderer}
  * @required
  * @readonly
@@ -236,6 +242,11 @@
 if ( attributes.get( project ) == null )
 {
 attributes.put( project, project );
+}
+
+if ( attributes.get( outputEncoding ) == null )
+{
+attributes.put( outputEncoding, outputEncoding );
 }
 
 try

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=231433r1=231432r2=231433view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Thu Aug 11 05:28:52 2005
@@ -139,7 +139,7 @@
 #foreach( $author in $authors )
   meta name=author content=$author /
 #end
-meta http-equiv=Content-Type content=text/html; charset=ISO-8859-1 /
+meta http-equiv=Content-Type content=text/html; 
charset=${outputEncoding} /
   /head
   body class=composite
 div id=banner



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r230549 - in /maven/components/trunk/maven-plugins/maven-javadoc-plugin: ./ src/main/java/org/apache/maven/plugin/javadoc/ src/test/projects/javadoc-plugin-test1/ src/test/projects/javadoc-plugin-test1/src/main/java/org/apache/maven/plugin/...

[vsiveton]

Author: vsiveton
Date: Sat Aug  6 07:32:43 2005
New Revision: 230549

URL: http://svn.apache.org/viewcvs?rev=230549view=rev
Log:
Added methods to repeat arguments (for group, tag, link and linkoffline options 
provided by the Javadoc standard doclet). Added plexus-utils as transitive dep.

Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml

maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/src/main/java/org/apache/maven/plugin/javadoc/test1/App.java

Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml?rev=230549r1=230548r2=230549view=diff
==
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml Sat Aug  
6 07:32:43 2005
@@ -40,6 +40,10 @@
   artifactIdcommons-lang/artifactId
   version2.1/version
 /dependency
+dependency
+  groupIdplexus/groupId
+  artifactIdplexus-utils/artifactId
+/dependency
   /dependencies
   developers
 developer

Modified: 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=230549r1=230548r2=230549view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Sat Aug  6 07:32:43 2005
@@ -26,7 +26,6 @@
 import java.util.StringTokenizer;
 
 import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.maven.project.MavenProject;
@@ -37,6 +36,7 @@
 import org.codehaus.doxia.site.renderer.SiteRenderer;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.DefaultConsumer;
@@ -60,24 +60,29 @@
 extends AbstractMavenReport
 {
 /** The current class directory */
-private static final String RESOURCE_DIR = 
ClassUtils.getPackageName(JavadocReport.class).replace('.', '/');
+private static final String RESOURCE_DIR = ClassUtils.getPackageName( 
JavadocReport.class ).replace( '.', '/' );
 
 /** Default location for css */
 private static final String DEFAULT_CSS_NAME = stylesheet.css;
+
 private static final String RESOURCE_CSS_DIR = RESOURCE_DIR + /css;
-
+
 // Using for the plugin:xdoc goal. Best way?
 /** Default bottom */
 private static final String DEFAULT_BOTTOM = Copyright 
${project.inceptionYear-currentYear} ${project.organization.name}. All Rights 
Reserved.;
+
 /** Default bottom */
 private static final String DEFAULT_DESTDIR = 
${project.build.directory}/site/apidocs;
+
 /** Default doctitle */
 private static final String DEFAULT_DOCTITLE = ${windowtitle};
+
 /** Default organization name */
 private static final String DEFAULT_ORGANIZATION_NAME = The Apache 
Software Foundation;
+
 /** Default window title */
 private static final String DEFAULT_WINDOW_TITLE = ${project.name} 
${project.version} API;
-   
+
 /**
  * @parameter expression=${project.build.directory}/site
  * @required
@@ -112,7 +117,7 @@
  * See a 
href=http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#breakiterator;breakiterator/a.
  * 
  * @parameter expression=${breakiterator}
- *default-value=false
+ * default-value=false
  */
 private boolean breakiterator = false;
 
@@ -185,7 +190,7 @@
  * See a 
href=http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#1.1;1.1/a.
  * 
  * @parameter expression=${old}
- *default-value=false
+ * default-value=false
  */
 private boolean old = false;
 
@@ -202,7 +207,7 @@
  * See a 
href=http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#package;package/a.
  * 
  * @parameter expression=${package}
- *default-value=true

svn commit: r230612 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ test/projects/project-info-reports-plugin-test11/

[vsiveton]

Author: vsiveton
Date: Sat Aug  6 17:07:50 2005
New Revision: 230612

URL: http://svn.apache.org/viewcvs?rev=230612view=rev
Log:
MNG-695: Added more tests on anonymousConnection, devConnection and scmUrl to 
prevent NPE. Added the test case num 11.

Added:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml
   (with props)
Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=230612r1=230611r2=230612view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 Sat Aug  6 17:07:50 2005
@@ -196,6 +196,19 @@
 anonymousConnection = scm.getConnection();
 devConnection = scm.getDeveloperConnection();
 
+if ( StringUtils.isEmpty( anonymousConnection ) 
+StringUtils.isEmpty( devConnection ) 
+StringUtils.isEmpty( scm.getUrl() ) )
+{
+startSection( getTitle() );
+
+paragraph( getBundle( locale ).getString( report.scm.noscm ) 
);
+
+endSection();
+
+return;
+}
+
 ScmRepository anonymousRepository = getScmRepository( 
anonymousConnection );
 ScmRepository devRepository = getScmRepository( devConnection );
 
@@ -264,7 +277,7 @@
 {
 startSection( getBundle( locale ).getString( 
report.scm.webaccess.title ) );
 
-if ( scmUrl == null )
+if ( StringUtils.isEmpty( scmUrl ) )
 {
 paragraph( getBundle( locale ).getString( 
report.scm.webaccess.nourl ) );
 }
@@ -288,7 +301,8 @@
 {
 if ( ( isScmSystem( anonymousRepository, clearcase ) )
 || ( isScmSystem( anonymousRepository, perforce ) )
-|| ( isScmSystem( anonymousRepository, starteam ) ) )
+|| ( isScmSystem( anonymousRepository, starteam ) ) 
+|| ( StringUtils.isEmpty( anonymousConnection ) ) )
 {
 return;
 }
@@ -313,6 +327,11 @@
 {
 paragraph( getBundle( locale ).getString( 
report.scm.anonymousaccess.general.intro ) );
 
+if ( anonymousConnection.length()  4 )
+{
+throw new IllegalArgumentException( The source repository 
connection is too short. );
+}
+
 verbatimText( anonymousConnection.substring( 4 ) );
 }
 
@@ -326,6 +345,11 @@
  */
 private void renderDeveloperAccessSection( ScmRepository devRepository 
)
 {
+if ( StringUtils.isEmpty( devConnection ) )
+{
+return;
+}
+
 startSection( getBundle( locale ).getString( 
report.scm.devaccess.title ) );
 
 if ( ( devRepository != null )  ( isScmSystem( devRepository, 
clearcase ) ) )
@@ -365,6 +389,11 @@
 {
 paragraph( getBundle( locale ).getString( 
report.scm.devaccess.general.intro ) );
 
+if ( devConnection.length()  4 )
+{
+throw new IllegalArgumentException( The source repository 
connection is too short. );
+}
+
 verbatimText( devConnection.substring( 4 ) );
 }
 
@@ -622,7 +651,7 @@
  */
 public ScmRepository getScmRepository( String scmUrl )
 {
-if ( scmUrl == null )
+if ( StringUtils.isEmpty( scmUrl ) )
 {
 return null;
 }

Added: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test11/pom.xml?rev=230612view=auto
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin

svn commit: r227345 - /maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml

[vsiveton]

Author: vsiveton
Date: Thu Aug  4 04:17:50 2005
New Revision: 227345

URL: http://svn.apache.org/viewcvs?rev=227345view=rev
Log:
Put plexus-utils dependency

Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=227345r1=227344r2=227345view=diff
==
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Thu Aug  4 
04:17:50 2005
@@ -61,6 +61,10 @@
   artifactIdwagon-ssh/artifactId
   version1.0-alpha-4/version
 /dependency
+dependency
+  groupIdplexus/groupId
+  artifactIdplexus-utils/artifactId
+/dependency
   /dependencies
   developers
 developer



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r227197 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin: ./ src/main/java/org/apache/maven/report/projectinfo/ src/main/resources/

[vsiveton]

Author: vsiveton
Date: Wed Aug  3 04:25:33 2005
New Revision: 227197

URL: http://svn.apache.org/viewcvs?rev=227197view=rev
Log:
Refactored the ScmReport class to handle the SCMs with the maven-scm component. 
Generates reports for all SCMs supported by the maven-scm-provider component: 
ClearCase, CVS, Perforce, Starteam and SVN.

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/resources/project-info-report_en.properties

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml?rev=227197r1=227196r2=227197view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml 
(original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml 
Wed Aug  3 04:25:33 2005
@@ -46,6 +46,41 @@
   artifactIdcommons-validator/artifactId
   version1.1.4/version
 /dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-api/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-provider-clearcase/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-provider-cvs/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-provider-perforce/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-provider-starteam/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-provider-svn/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
+dependency
+  groupIdorg.apache.maven.scm/groupId
+  artifactIdmaven-scm-manager-plexus/artifactId
+  version1.0-alpha-2-SNAPSHOT/version
+/dependency
   /dependencies
   developers
 developer

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=227197r1=227196r2=227197view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 Wed Aug  3 04:25:33 2005
@@ -22,11 +22,19 @@
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
+import 
org.apache.maven.scm.provider.clearcase.repository.ClearCaseScmProviderRepository;
+import 
org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
+import 
org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
+import 
org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.doxia.sink.Sink;
 import org.codehaus.doxia.site.renderer.SiteRenderer;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.IOException;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
@@ -62,6 +70,13 @@
 private MavenProject project;
 
 /**
+ * @parameter 
expression=${component.org.apache.maven.scm.manager.ScmManager}
+ * @required
+ * @readonly
+ */
+protected ScmManager scmManager;
+
+/**
  * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
  */
 public String getName( Locale locale )
@@ -115,7 +130,7 @@
 public void executeReport( Locale

svn commit: r227216 - in /maven/components/trunk/maven-plugins/maven-site-plugin: pom.xml src/main/java/org/apache/maven/doxia/DoxiaMojo.java

[vsiveton]

Author: vsiveton
Date: Wed Aug  3 06:11:10 2005
New Revision: 227216

URL: http://svn.apache.org/viewcvs?rev=227216view=rev
Log:
Rolling back to still allow exception on duplicate files and some small 
improvements.

Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=227216r1=227215r2=227216view=diff
==
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Wed Aug  3 
06:11:10 2005
@@ -61,10 +61,6 @@
   artifactIdwagon-ssh/artifactId
   version1.0-alpha-4/version
 /dependency
-dependency
-  groupIdplexus/groupId
-  artifactIdplexus-utils/artifactId
-/dependency
   /dependencies
   developers
 developer

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=227216r1=227215r2=227216view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Wed Aug  3 06:11:10 2005
@@ -257,9 +257,10 @@
 }
 }
 
+Locale locale;
 for ( Iterator iterator = localesList.iterator(); 
iterator.hasNext(); )
 {
-Locale locale = (Locale) iterator.next();
+locale = (Locale) iterator.next();
 
 File localeOutputDirectory = getOuputDirectory( locale );
 
@@ -272,9 +273,10 @@
 //Generate reports
 if ( reports != null )
 {
+MavenReport report;
 for ( Iterator j = reports.iterator(); j.hasNext(); )
 {
-MavenReport report = (MavenReport) j.next();
+report = (MavenReport) j.next();
 
 getLog().info( Generate \ + report.getName( locale 
) + \ report. );
 
@@ -365,10 +367,10 @@
 if ( duplicate.size()  0 )
 {
 StringBuffer sb = null;
-
+Map.Entry entry;
 for ( Iterator it = duplicate.entrySet().iterator(); 
it.hasNext(); )
 {
-Map.Entry entry = (Map.Entry) it.next();
+entry = (Map.Entry) it.next();
 Set values = (Set) entry.getValue();
 
 if ( values.size()  1 )
@@ -614,6 +616,11 @@
 
 /**
  * @todo should only be needed once
+ * 
+ * @param reports  a list of reports
+ * @param locale the current locale
+ * @return the inpustream 
+ * @throws MojoExecutionException is any 
  */
 private InputStream getSiteDescriptor( List reports, Locale locale )
 throws MojoExecutionException
@@ -663,7 +670,8 @@
 {
 if ( project.getModules() != null  project.getModules().size()  
0 )
 {
-props.put( modules, getModulesMenu( locale ) );
+/* See the Not working section, around line 460*/
+//props.put( modules, getModulesMenu( locale ) );
 }
 }
 
@@ -1003,9 +1011,10 @@
 List reports = new ArrayList();
 if ( reportPlugins != null )
 {
+ReportPlugin reportPlugin;
 for ( Iterator it = reportPlugins.iterator(); it.hasNext(); )
 {
-ReportPlugin reportPlugin = (ReportPlugin) it.next();
+reportPlugin = (ReportPlugin) it.next();
 
 try
 {
@@ -1020,9 +1029,10 @@
 }
 else
 {
+ReportSet reportSet;
 for ( Iterator j = reportSets.iterator(); j.hasNext(); 
)
 {
-ReportSet reportSet = (ReportSet) j.next();
+reportSet = (ReportSet) j.next();
 
 reportsList = pluginManager.getReports( 
reportPlugin, reportSet, project, session );
 }
@@ -1052,8 +1062,8 @@
 }
 
 /**
- * Convenience method that try to find duplicate files in a given 
directory.
- * pThe scan is case unsensitive./p
+ * Convenience method

svn commit: r226900 - /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java

[vsiveton]

Author: vsiveton
Date: Mon Aug  1 15:30:26 2005
New Revision: 226900

URL: http://svn.apache.org/viewcvs?rev=226900view=rev
Log:
Correct a JS method name and format JS script

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=226900r1=226899r2=226900view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
 Mon Aug  1 15:30:26 2005
@@ -163,13 +163,15 @@
 startSection( getBundle( locale ).getString( 
report.team-list.intro.title ) );
 
 // To handle JS
-StringBuffer javascript = new StringBuffer( function 
offsetDate(id, offset) { )
-.append( var now = new Date() ; ).append( var nowTime = 
now.getTime() ; )
-.append( var localOffset = now.getTimezoneOffset() ; )
-.append( var developerTime = nowTime + ( offset * 60 * 60 * 
1000 ) + ( localOffset * 60 * 1000 ) ; )
-.append( var developerDate = new Date(developerTime) ; 
).append(  )
-.append( document.getElementById(id).innerHTML = 
developerDate; ).append( } ).append(  )
-.append( function init(){ );
+StringBuffer javascript = new StringBuffer( function 
offsetDate(id, offset) {\n )
+.append( var now = new Date();\n )
+.append( var nowTime = now.getTime();\n )
+.append( var localOffset = now.getTimezoneOffset();\n )
+.append( var developerTime = nowTime + ( offset * 60 * 60 
* 1000 ) + ( localOffset * 60 * 1000 );\n )
+.append( var developerDate = new Date(developerTime);\n 
).append( \n )
+.append( document.getElementById(id).innerHTML = 
developerDate;\n ).append( }\n )
+.append( \n )
+.append( function init(){\n );
 
 // Intoduction
 paragraph( getBundle( locale ).getString( 
report.team-list.intro.description1 ) );
@@ -232,8 +234,7 @@
 
 tableCell( developer.getOrganization() );
 
-tableCell( createLinkPatternedText( 
developer.getOrganizationUrl(), 
-
developer.getOrganizationUrl() ) );
+tableCell( createLinkPatternedText( 
developer.getOrganizationUrl(), developer.getOrganizationUrl() ) );
 
 if ( developer.getRoles() != null )
 {
@@ -253,7 +254,7 @@
 text( developer.getTimezone() );
 if ( !StringUtils.isEmpty( developer.getTimezone() ) )
 {
-javascript.append( offsetDate('developer- + 
developersRows + ', ' );
+javascript.append( offsetDate('developer- + 
developersRows + ', ' );
 javascript.append( developer.getTimezone() );
 javascript.append( ');\n );
 }
@@ -333,8 +334,8 @@
 
 tableCell( contributor.getOrganization() );
 
-tableCell( createLinkPatternedText( 
contributor.getOrganizationUrl(), 
-
contributor.getOrganizationUrl() ) );
+tableCell( createLinkPatternedText( 
contributor.getOrganizationUrl(), contributor
+.getOrganizationUrl() ) );
 
 if ( contributor.getRoles() != null )
 {
@@ -354,7 +355,7 @@
 text( contributor.getTimezone() );
 if ( !StringUtils.isEmpty( contributor.getTimezone() ) )
 {
-javascript.append( offsetDate('contributor- + 
contributorsRows + ', ' );
+javascript.append( offsetDate('contributor- + 
contributorsRows + ', ' );
 javascript.append( contributor.getTimezone() );
 javascript.append( ');\n );
 }
@@ -384,7 +385,7 @@
 endSection();
 
 // To handle JS
-javascript.append( } ).append( window.onload = init(); );
+javascript.append( }\n ).append( \n ).append( window.onLoad = 
init();\n );
 javaScript

svn commit: r226349 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

[vsiveton]

Author: vsiveton
Date: Fri Jul 29 04:49:47 2005
New Revision: 226349

URL: http://svn.apache.org/viewcvs?rev=226349view=rev
Log:
Refactor the maven-site.vm: added a macro to handle the copyright

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=226349r1=226348r2=226349view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Fri Jul 29 04:49:47 2005
@@ -106,6 +106,26 @@
   #end
 #end
 
+#macro ( copyright )
+  #if ( $project )
+#set ( $currentYear = ${currentDate.year} + 1900 )
+
+#if ( ${project.inceptionYear}  ( ${project.inceptionYear} != 
${currentYear.toString()} ) )
+  ${project.inceptionYear}-${currentYear}
+#else
+  ${currentYear}
+#end
+
+#if ( ${project.organization}  ${project.organization.name} )
+  ${project.organization.name}
+#else
+  Apache Software Foundation
+#end
+  #else
+2002-2005, Apache Software Foundation
+  #end
+#end
+
 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
 html
   head
@@ -151,25 +171,7 @@
   hr/
 /div
 div id=footer
-  div class=xright#169; 
-#if ( $project )
-  #set ( $currentYear = ${currentDate.year} + 1900 )
-
-  #if ( ${project.inceptionYear}  ( ${project.inceptionYear} != 
${currentYear.toString()} ) )
-${project.inceptionYear}-${currentYear}
-  #else
-${currentYear}
-  #end
-
-  #if ( ${project.organization}  ${project.organization.name} )
-${project.organization.name}
-  #else
-Apache Software Foundation
-  #end
-#else
-  2002-2005, Apache Software Foundation
-#end
-  /div
+  div class=xright#169;#copyright()/div
   div class=clear
 hr/
   /div



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r226350 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

[vsiveton]

Author: vsiveton
Date: Fri Jul 29 04:52:43 2005
New Revision: 226350

URL: http://svn.apache.org/viewcvs?rev=226350view=rev
Log:
Throw an exception if files in the site directory or in the generated site 
directory are duplicates

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=226350r1=226349r2=226350view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Fri Jul 29 04:52:43 2005
@@ -36,12 +36,10 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.SelectorUtils;
 import org.codehaus.plexus.util.StringInputStream;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -55,6 +53,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -76,9 +75,19 @@
 
 private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + 
/maven-site.vm;
 
+/** OutputName of all project info report files generated by Maven */ 
+private static final String[] PROJECT_INFO_FILES = new String[] { 
integration,
+dependencies,
+issue-tracking,
+license,
+mail-lists,
+source-repository,
+team-list };
+
 /**
  * Patterns which should be excluded by default.
  */
+// TODO Push me in AbstractMojo class and remove me from 
AbstractMavenReport class
 private static final String[] DEFAULT_EXCLUDES = new String[]{
 // Miscellaneous typical temporary files
 **/*~, **/#*#, **/.#*, **/%*%, **/._*,
@@ -185,6 +194,9 @@
 
 private List localesList = new ArrayList();
 
+/**
+ * @see org.apache.maven.plugin.Mojo#execute()
+ */
 public void execute()
 throws MojoExecutionException
 {
@@ -240,9 +252,9 @@
 }
 }
 
-for ( Iterator i = localesList.iterator(); i.hasNext(); )
+for ( Iterator iterator = localesList.iterator(); 
iterator.hasNext(); )
 {
-Locale locale = (Locale) i.next();
+Locale locale = (Locale) iterator.next();
 
 File localeOutputDirectory = getOuputDirectory( locale );
 
@@ -333,17 +345,78 @@
 siteDirectoryFile = new File( siteDirectory, 
locale.getLanguage() );
 }
 
+// Try to find duplicate files
+Map duplicate = new LinkedHashMap();
+if ( siteDirectoryFile.exists() )
+{
+tryToFindDuplicates( siteDirectoryFile, duplicate );
+}
+if ( generatedSiteFile.exists() )
+{
+tryToFindDuplicates( generatedSiteFile, duplicate );
+}
+
+// Exception if a file is duplicate 
+if ( ( duplicate.entrySet() != null )  ( 
duplicate.entrySet().size()  0 ) )
+{
+StringBuffer sb = null;
+
+for ( Iterator it = duplicate.entrySet().iterator(); 
it.hasNext(); )
+{
+Map.Entry entry = (Map.Entry) it.next();
+List values = (List) entry.getValue();
+
+if ( values != null  values.size()  1 )
+{
+if ( sb == null )
+{
+sb = new StringBuffer( Some files are 
duplicates in the site directory or in the generated-site directory. 
+  + Review the following 
files: );
+}
+
+sb.append( \n ).append( entry.getKey() ).append( 
\n );
+
+for ( Iterator it2 = values.iterator(); 
it2.hasNext(); )
+{
+String current = (String) it2.next();
+sb.append( \t ).append( current );
+if ( it2.hasNext() )
+{
+sb.append( \n

svn commit: r226364 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src: main/java/org/apache/maven/doxia/ main/resources/ test/projects/site-plugin-test8/ test/projects/site-plugin-test8/framework/ test/projects/site-plugin-test8/framewor...

[vsiveton]

Author: vsiveton
Date: Fri Jul 29 05:37:56 2005
New Revision: 226364

URL: http://svn.apache.org/viewcvs?rev=226364view=rev
Log:
MNG-661: added link between parent project and modules

Added:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/maven/plugin/site/test8/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/main/java/org/apache/maven/plugin/site/test8/App.java
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/site/apt/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/site/apt/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/site/site.xml
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/maven/plugin/site/test8/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/test/java/org/apache/maven/plugin/site/test8/AppTest.java
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins

svn commit: r225654 - /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java

[vsiveton]

Author: vsiveton
Date: Wed Jul 27 16:35:12 2005
New Revision: 225654

URL: http://svn.apache.org/viewcvs?rev=225654view=rev
Log:
MNG-663: adding a link for the URL of the organization for developer

Modified:

maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java

Modified: 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=225654r1=225653r2=225654view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
 Wed Jul 27 16:35:12 2005
@@ -27,7 +27,6 @@
 import org.codehaus.doxia.site.renderer.SiteRenderer;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -233,7 +232,8 @@
 
 tableCell( developer.getOrganization() );
 
-tableCell( developer.getOrganizationUrl() );
+tableCell( createLinkPatternedText( 
developer.getOrganizationUrl(), 
+
developer.getOrganizationUrl() ) );
 
 if ( developer.getRoles() != null )
 {
@@ -333,8 +333,8 @@
 
 tableCell( contributor.getOrganization() );
 
-tableCell( createLinkPatternedText( 
contributor.getOrganizationUrl(), contributor
-.getOrganizationUrl() ) );
+tableCell( createLinkPatternedText( 
contributor.getOrganizationUrl(), 
+
contributor.getOrganizationUrl() ) );
 
 if ( contributor.getRoles() != null )
 {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r225270 - in /maven/components/trunk/maven-plugins/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java

[vsiveton]

Author: vsiveton
Date: Tue Jul 26 03:44:06 2005
New Revision: 225270

URL: http://svn.apache.org/viewcvs?rev=225270view=rev
Log:
MNG-477: Trying to unpack none jar file

Modified:
maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java

Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml?rev=225270r1=225269r2=225270view=diff
==
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml 
(original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml Tue Jul 
26 03:44:06 2005
@@ -1,3 +1,23 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ --
+
 project xmlns=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;
   parent
@@ -22,6 +42,17 @@
   version1.0-alpha-1/version
 /dependency
   /dependencies
+  developers
+developer
+  idvsiveton/id
+  nameVincent Siveton/name
+  email[EMAIL PROTECTED]/email
+  roles
+roleJava Developer/role
+  /roles
+  timezone-5/timezone
+/developer
+  /developers
   build
 plugins
   plugin

Modified: 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=225270r1=225269r2=225270view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
 Tue Jul 26 03:44:06 2005
@@ -58,6 +58,7 @@
  * Assemble an application bundle or distribution.
  *
  * @author a href=mailto:[EMAIL PROTECTED]Brett Porter/a
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
  * @version $Id$
  * @goal assembly
  * @requiresDependencyResolution test
@@ -292,6 +293,12 @@
 private void unpackJar( File file, File tempLocation )
 throws IOException
 {
+if ( !file.getAbsolutePath().toLowerCase().trim().endsWith( jar ) )
+{
+getLog().warn( Trying to unpack a none jar file  + 
file.getAbsolutePath() +  - IGNORING );
+return;
+}
+
 JarFile jar = new JarFile( file );
 for ( Enumeration e = jar.entries(); e.hasMoreElements(); )
 {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r225290 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

[vsiveton]

Author: vsiveton
Date: Tue Jul 26 05:33:12 2005
New Revision: 225290

URL: http://svn.apache.org/viewcvs?rev=225290view=rev
Log:
MNG-588: Throw an exception if two index files already exist

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=225290r1=225289r2=225290view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Tue Jul 26 05:33:12 2005
@@ -560,10 +560,20 @@
 
 if ( indexFound.size()  1 )
 {
-// TODO throw an Exception?
-getLog().warn( More than one index file exists in the project 
site directory. Checks the result. );
-return true;
+StringBuffer sb = new StringBuffer( \n );
+for ( Iterator it = indexFound.iterator(); it.hasNext(); )
+{
+sb.append(  *  );
+sb.append( ( (File) it.next() ).getAbsolutePath() );
+if ( it.hasNext() )
+{
+sb.append( \n );
+}
+}
+throw new MavenReportException( More than one index file exists 
in the project site directory. 
++ You have to delete one of these files:  + sb.toString() );
 }
+
 if ( indexFound.size() == 1 )
 {
 getLog().warn( One index file was found in the project site 
directory. );



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r225446 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src: main/java/org/apache/maven/doxia/ main/resources/org/apache/maven/doxia/ test/projects/site-plugin-test7/ test/projects/site-plugin-test7/src/ test/projects/site-plug...

[vsiveton]

Author: vsiveton
Date: Tue Jul 26 20:12:55 2005
New Revision: 225446

URL: http://svn.apache.org/viewcvs?rev=225446view=rev
Log:
MNG-599: Using the organization name and the inception year in the Velocity 
template

Added:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
   (with props)
Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=225446r1=225445r2=225446view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Tue Jul 26 20:12:55 2005
@@ -212,6 +212,16 @@
 
 List reports = getReports();
 
+if ( attributes == null )
+{
+attributes = new HashMap();
+}
+
+if ( attributes.get( project ) == null )
+{
+attributes.put( project, project );
+}
+
 try
 {
 categorizeReports( reports );

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=225446r1=225445r2=225446view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Tue Jul 26 20:12:55 2005
@@ -151,7 +151,25 @@
   hr/
 /div
 div id=footer
-  div class=xright#169; 2002-2005, Apache Software Foundation/div
+  div class=xright#169; 
+#if ( $project )
+  #set ( $currentYear

svn commit: r225450 - /maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

[vsiveton]

Author: vsiveton
Date: Tue Jul 26 21:09:34 2005
New Revision: 225450

URL: http://svn.apache.org/viewcvs?rev=225450view=rev
Log:
Fix a typo for bottom

Modified:

maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=225450r1=225449r2=225450view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Tue Jul 26 21:09:34 2005
@@ -62,8 +62,6 @@
 /** The current class directory */
 private static final String RESOURCE_DIR = 
ClassUtils.getPackageName(JavadocReport.class).replace('.', '/');
 
-private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + 
/maven-site.vm;
-
 /** Default location for css */
 private static final String DEFAULT_CSS_NAME = stylesheet.css;
 private static final String RESOURCE_CSS_DIR = RESOURCE_DIR + /css;
@@ -277,7 +275,7 @@
  * See a 
href=http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#bottom;bottom/a.
  * 
  * @parameter expression=${bottom}
- *default-value=ISO-8859-1
+ *default-value=Copyright 
${project.inceptionYear-currentYear} ${project.organization.name}. All Rights 
Reserved.
  */
 private String bottom;
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r219835 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

[vsiveton]

Author: vsiveton
Date: Tue Jul 19 19:57:54 2005
New Revision: 219835

URL: http://svn.apache.org/viewcvs?rev=219835view=rev
Log:
Correct typo and code format

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=219835r1=219834r2=219835view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Tue Jul 19 19:57:54 2005
@@ -39,17 +39,17 @@
   #end
 #end
 
-#macro ( displayTree $display $item)
-  #if ( $item.getChildren()  $item.getChildCount()  0 )
+#macro ( displayTree $display $item )
+  #if ( $item  $item.getChildren()  $item.getChildCount()  0 )
 #foreach( $subitem in $item.getChildren() )
   #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute( 
href ), $relativePath ) )
-  #set ( $subitemHref = $$subitemHref.replaceAll( \\, / ) )
+  #set ( $subitemHref = $subitemHref.replaceAll( \\, / ) )
 
   #if ( $currentFileName == $subitemHref ) 
 #set ( $display = true )
   #end
   
-  #displayTree($display $subitem)
+  #displayTree( $display $subitem )
 #end
   #end
 #end
@@ -60,7 +60,7 @@
   #set ( $currentFileName = $currentFileName.replaceAll( \\, / ) )
   #set ( $currentItemHref = $currentItemHref.replaceAll( \\, / ) )
 
-  #if ( $item.getChildCount()  0 )
+  #if ( $item  $item.getChildCount()  0 )
 #if ( ( $item.getAttribute( collapse ) )  ( $item.getAttribute( 
collapse ).equalsIgnoreCase( false ) ) )
   #set ( $collapse = expanded )
 #else
@@ -79,10 +79,10 @@
   a href=$currentItemHref$item.getAttribute( name )/a
 #end
   /li
-  #if ( $item.getChildren()  $item.getChildCount()  0 )
+  #if ( $item  $item.getChildren()  $item.getChildCount()  0 )
 #set ( $display = false )
 #set ( $itemTmp = $item )
-#displayTree($display $itemTmp)
+#displayTree( $display $itemTmp )
 
 #if ( $collapse == expanded || $display )
   ul



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r219837 - /maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java

[vsiveton]

Author: vsiveton
Date: Tue Jul 19 20:08:58 2005
New Revision: 219837

URL: http://svn.apache.org/viewcvs?rev=219837view=rev
Log:
Remove unused import

Modified:

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java

Modified: 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=219837r1=219836r2=219837view=diff
==
--- 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
 (original)
+++ 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
 Tue Jul 19 20:08:58 2005
@@ -31,7 +31,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Properties;
 import java.util.ResourceBundle;
 
 /**



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r219190 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects: site-plugin-test1/src/site/apt/ site-plugin-test2/src/site/apt/ site-plugin-test3/src/site/apt/ site-plugin-test4/src/site/apt/ site-plugin-test5/src/si...

[vsiveton]

Author: vsiveton
Date: Fri Jul 15 05:42:28 2005
New Revision: 219190

URL: http://svn.apache.org/viewcvs?rev=219190view=rev
Log:
Removed \U000C character in .apt files

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/two/index.apt

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt?rev=219190r1=219189r2=219190view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt
 Fri Jul 15 05:42:28 2005
@@ -5,8 +5,8 @@
  --
  13 July 2005
  --
-
+
 
 Site Plugin Test
 
-Todo
\ No newline at end of file
+ Todo

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt?rev=219190r1=219189r2=219190view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt
 Fri Jul 15 05:42:28 2005
@@ -5,8 +5,8 @@
  --
  13 July 2005
  --
-
+
 
 Site Plugin Test
 
-Todo
\ No newline at end of file
+ Todo

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/apt/test.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin

svn commit: r219253 - in /maven/components/trunk/maven-plugins/maven-site-plugin: ./ src/main/java/org/apache/maven/doxia/ src/main/resources/org/apache/maven/doxia/ src/test/projects/site-plugin-test6/src/site/apt/gamma/ src/test/projects/site-plugin-...

[vsiveton]

Author: vsiveton
Date: Fri Jul 15 15:55:33 2005
New Revision: 219253

URL: http://svn.apache.org/viewcvs?rev=219253view=rev
Log:
Upgraded to plexus-site-renderer-1.0-alpha-2 and corrected a NPE

Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=219253r1=219252r2=219253view=diff
==
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Fri Jul 15 
15:55:33 2005
@@ -48,7 +48,7 @@
 dependency
   groupIdplexus/groupId
   artifactIdplexus-site-renderer/artifactId
-  version1.0-alpha-1/version
+  version1.0-alpha-2-20050715.080727-2/version
 /dependency
 dependency
   groupIdorg.apache.maven.wagon/groupId

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=219253r1=219252r2=219253view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Fri Jul 15 15:55:33 2005
@@ -548,6 +548,11 @@
 }
 });
 
+if ( ( directories == null ) || ( directories.length  == 0 ) )
+{
+return false;
+}
+
 List indexFound = new ArrayList();
 for ( int i = 0; i  directories.length; i++ )
 {

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=219253r1=219252r2=219253view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Fri Jul 15 15:55:33 2005
@@ -39,27 +39,26 @@
   #end
 #end
 
+#macro ( displayTree $display $item)
+  #if ( $item.getChildren()  $item.getChildCount()  0 )
+#foreach( $subitem in $item.getChildren() )
+  #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute( 
href ), $relativePath ) )
+  #set ( $subitemHref = $$subitemHref.replaceAll( \\, / ) )
+
+  #if ( $currentFileName == $subitemHref ) 
+#set ( $display = true )
+  #end
+  
+  #displayTree($display $subitem)
+#end
+  #end
+#end
+
 #macro ( menuItem $item )
   #set ( $collapse = none )
   #set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute( 
href ), $relativePath ) )
   #set ( $currentFileName = $currentFileName.replaceAll( \\, / ) )
   #set ( $currentItemHref = $currentItemHref.replaceAll( \\, / ) )
-  
-  #set ( $currentFileNameLastSlash = $currentFileName.lastIndexOf( / ) )
-  #if ( $currentFileNameLastSlash != -1)
-#set ( $currentFileNameTmp = $currentFileName.substring( 0, 
$currentFileNameLastSlash ) )
-  #else
-#set ( $currentFileNameTmp = $currentFileName.substring( 0, 
$currentFileName.lengh() ) )
-  #end
-
-  #set ( $currentItemHrefLastSlash = $currentItemHref.lastIndexOf( / ) )
-  #if ( $currentItemHrefLastSlash != -1)
-#set ( $currentItemHrefTmp = $currentItemHref.substring( 0, 
$currentItemHrefLastSlash ) )
-  #else
-#set ( $currentItemHrefTmp = $currentItemHref.substring( 0, 
$currentItemHref.lengh() ) )
-  #end
-
-  #set ( $tree = $currentFileNameTmp  $currentItemHrefTmp  
$currentFileNameTmp.startsWith( $currentItemHrefTmp ) )
 
   #if ( $item.getChildCount()  0 )
 #if ( ( $item.getAttribute( collapse ) )  ( $item.getAttribute( 
collapse ).equalsIgnoreCase( false ) ) )
@@ -68,31 +67,29 @@
   ## By default collapsed
   #set ( $collapse = collapsed )
 #end
-
-#if ( $currentFileName == $currentItemHref )
-  #set

svn commit: r219261 - in /maven/components/trunk/maven-reports/maven-project-info-reports-plugin: ./ src/main/java/org/apache/maven/report/projectinfo/ src/main/resources/ src/test/ src/test/projects/ src/test/projects/project-info-reports-plugin-test1...

[vsiveton]

Author: vsiveton
Date: Fri Jul 15 16:31:53 2005
New Revision: 219261

URL: http://svn.apache.org/viewcvs?rev=219261view=rev
Log:
MNG-411: all transitive dependencies report

Added:

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/pom.xml
   (with props)

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/maven/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/maven/report/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/maven/report/projectinfo/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/maven/report/projectinfo/test1/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/main/java/org/apache/maven/report/projectinfo/test1/App.java
   (with props)

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/maven/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/maven/report/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/maven/report/projectinfo/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/maven/report/projectinfo/test1/

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/test/projects/project-info-reports-plugin-test1/src/test/java/org/apache/maven/report/projectinfo/test1/AppTest.java
   (with props)
Modified:

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/project-info-report_en.properties

maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties

Modified: 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml?rev=219261r1=219260r2=219261view=diff
==
--- 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml 
(original)
+++ 
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml 
Fri Jul 15 16:31:53 2005
@@ -1,3 +1,23 @@
+?xml version=1.0 encoding=ISO-8859-1?

+

+!--

+/*

+ * Copyright 2001-2005 The Apache Software Foundation.

+ *

+ * Licensed under the Apache License, Version 2.0 (the License);

+ * you may not use

svn commit: r219149 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt: ./ beta/two/ gamma/ gamma/one/ gamma/one/one/ gamma/one/two/ gamma/two/ gamma/two/one/ gamma/two/two/ theta/ theta/one/ t...

[vsiveton]

Author: vsiveton
Date: Thu Jul 14 18:46:41 2005
New Revision: 219149

URL: http://svn.apache.org/viewcvs?rev=219149view=rev
Log:
Updated Test case for MNG-584 and MNG-585 issues.

Added:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/one/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/one/two/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/one/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/two/two/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/one/index.apt
   (with props)

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/theta/two/index.apt
   (with props)
Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt?rev=219149r1=219148r2=219149view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt
 Thu Jul 14 18:46:41 2005
@@ -9,4 +9,4 @@
 
 Site Plugin Index
 
- From /beta/beta/index.apt
\ No newline at end of file
+ From /beta/two/index.apt
\ No newline at end of file

Added: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt?rev=219149view=auto
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
 (added)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt
 Thu Jul 14 18:46:41 2005
@@ -0,0 +1,12 @@
+ --
+ Configuring Site Plugin
+ --
+ Vincent Siveton
+ --
+ 13 July 2005
+ --
+
+
+Site Plugin Index
+
+ From /theta/index.apt
\ No newline at end of file

Propchange: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/gamma/index.apt

svn commit: r219151 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src: main/resources/org/apache/maven/doxia/maven-site.vm test/projects/site-plugin-test6/src/site/site.xml

[vsiveton]

Author: vsiveton
Date: Thu Jul 14 18:56:03 2005
New Revision: 219151

URL: http://svn.apache.org/viewcvs?rev=219151view=rev
Log:
Beautified Velocity template

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=219151r1=219150r2=219151view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
 Thu Jul 14 18:56:03 2005
@@ -40,18 +40,45 @@
 #end
 
 #macro ( menuItem $item )
+  #set ( $collapse = none )
+  #set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute( 
href ), $relativePath ) )
+  #set ( $currentFileName = $currentFileName.replaceAll( \\, / ) )
+  #set ( $currentItemHref = $currentItemHref.replaceAll( \\, / ) )
+  
+  #set ( $currentFileNameLastSlash = $currentFileName.lastIndexOf( / ) )
+  #if ( $currentFileNameLastSlash != -1)
+#set ( $currentFileNameTmp = $currentFileName.substring( 0, 
$currentFileNameLastSlash ) )
+  #else
+#set ( $currentFileNameTmp = $currentFileName.substring( 0, 
$currentFileName.lengh() ) )
+  #end
+
+  #set ( $currentItemHrefLastSlash = $currentItemHref.lastIndexOf( / ) )
+  #if ( $currentItemHrefLastSlash != -1)
+#set ( $currentItemHrefTmp = $currentItemHref.substring( 0, 
$currentItemHrefLastSlash ) )
+  #else
+#set ( $currentItemHrefTmp = $currentItemHref.substring( 0, 
$currentItemHref.lengh() ) )
+  #end
+
+  #set ( $tree = $currentFileNameTmp  $currentItemHrefTmp  
$currentFileNameTmp.startsWith( $currentItemHrefTmp ) )
+
   #if ( $item.getChildCount()  0 )
-#if ( $item.getAttribute( collapse ) == true )
-  #set ( $collapse = collapsed )
+#if ( ( $item.getAttribute( collapse ) )  ( $item.getAttribute( 
collapse ).equalsIgnoreCase( false ) ) )
+  #set ( $collapse = expanded )
 #else
+  ## By default collapsed
+  #set ( $collapse = collapsed )
+#end
+
+#if ( $currentFileName == $currentItemHref )
+  #set ( $collapse = expanded )
+#end
+
+#if ( $tree )
   #set ( $collapse = expanded )
 #end
-  #else
-#set ( $collapse = none )
   #end
-  #set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute( 
href ), $relativePath ) )
-  li class=$collapse
-#if ( $currentFileName.replaceAll('\\', '/') == $currentItemHref )
+  li class=$collapse $currentFileName $currentItemHref
+#if ( $currentFileName == $currentItemHref ) 
   stronga href=$currentItemHref$item.getAttribute( name 
)/a/strong
 #else
   a href=$currentItemHref$item.getAttribute( name )/a
@@ -59,12 +86,12 @@
   /li
   #if ( $item.getChildren() )
 #if ( $item.getChildCount()  0 )
-  #if ( $collapse != collapsed )
-  ul
-#foreach( $subitem in $item.getChildren() )
-  #menuItem( $subitem )
-#end
-  /ul
+  #if ( $collapse == expanded || $tree )
+ul
+  #foreach( $subitem in $item.getChildren() )
+#menuItem( $subitem )
+  #end
+/ul
   #end
 #end
   #end

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml?rev=219151r1=219150r2=219151view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
 Thu Jul 14 18:56:03 2005
@@ -37,7 +37,7 @@
   !-- Standalone item -- 
   item name=Item href=/item.html / 
 
-  !-- Uncollapsed Submenu -- 
+  !-- Collapsed Submenu (default) -- 
   item name=Alpha href=/alpha/index.html 
 item name=Alpha One href=/alpha/one/index.html/ 
 item name=Alpha Two href=/alpha/two/index.html/ 
@@ -48,6 +48,24 @@
 item name=Beta One href=/beta/one/index.html collapse=true/ 
 item name=Beta Two href=/beta/two/index.html collapse=true/ 
   /item 
+
+  !-- UnCollapsed Submenu -- 
+  item name=Theta href=/theta/index.html collapse=false 
+item name=Theta One href=/theta/one/index.html/ 
+item name=Theta Two href=/theta/two

svn commit: r216145 - in /maven/components/trunk/maven-plugins/maven-site-plugin: pom.xml src/main/java/org/apache/maven/doxia/DoxiaMojo.java

[vsiveton]

Author: vsiveton
Date: Wed Jul 13 05:20:40 2005
New Revision: 216145

URL: http://svn.apache.org/viewcvs?rev=216145view=rev
Log:
Take care about generatedSiteDirectory var

Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=216145r1=216144r2=216145view=diff
==
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Wed Jul 13 
05:20:40 2005
@@ -1,3 +1,23 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ --
+
 project
   modelVersion4.0.0/modelVersion
   parent
@@ -41,4 +61,16 @@
   version1.0-alpha-4/version
 /dependency
   /dependencies
+  developers
+developer
+  idvsiveton/id
+  nameVincent Siveton/name
+  email[EMAIL PROTECTED]/email
+  organizationApache Software Foundation/organization
+  roles
+roleJava Developer/role
+  /roles
+  timezone-5/timezone
+/developer
+  /developers
 /project

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=216145r1=216144r2=216145view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Wed Jul 13 05:20:40 2005
@@ -60,9 +60,10 @@
 import java.util.StringTokenizer;
 
 /**
- * Generate the project site.
+ * Generates the project site.
  *
  * @author a href=mailto:[EMAIL PROTECTED]Emmanuel Venisse/a
+ * @author a href=mailto:[EMAIL PROTECTED]Vincent Siveton/a
  * @version $Id$
  * @goal site
  * @requiresDependencyResolution test
@@ -280,6 +281,14 @@
 throw new MojoExecutionException( An error is 
occurred in project reports page generation.,
   e );
 }
+}
+
+// Generated Site Directory
+File generatedSiteFile = new File( generatedSiteDirectory );
+if ( generatedSiteFile.exists() )
+{
+siteRenderer.render( generatedSiteFile, 
localeOutputDirectory,
+ getSiteDescriptor( reports, locale ), 
template, attributes, locale );
 }
 
 // Generate static site



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r216148 - in /maven/components/trunk/maven-reports/maven-javadoc-plugin: pom.xml src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java src/site/apt/configuration.apt src/site/site.xml src/test/projects/javadoc-plugin-test1/pom.xml

[vsiveton]

Author: vsiveton
Date: Wed Jul 13 05:28:03 2005
New Revision: 216148

URL: http://svn.apache.org/viewcvs?rev=216148view=rev
Log:
MNG-561: improve documentation for the plugin:xdoc goal

Modified:
maven/components/trunk/maven-reports/maven-javadoc-plugin/pom.xml

maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

maven/components/trunk/maven-reports/maven-javadoc-plugin/src/site/apt/configuration.apt
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/site/site.xml

maven/components/trunk/maven-reports/maven-javadoc-plugin/src/test/projects/javadoc-plugin-test1/pom.xml

Modified: maven/components/trunk/maven-reports/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-javadoc-plugin/pom.xml?rev=216148r1=216147r2=216148view=diff
==
--- maven/components/trunk/maven-reports/maven-javadoc-plugin/pom.xml (original)
+++ maven/components/trunk/maven-reports/maven-javadoc-plugin/pom.xml Wed Jul 
13 05:28:03 2005
@@ -1,3 +1,23 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ --
+
 project
   modelVersion4.0.0/modelVersion
   parent
@@ -6,7 +26,7 @@
 version2.0-beta-1-SNAPSHOT/version
   /parent
   artifactIdmaven-javadoc-plugin/artifactId
-  version2.0-alpha-2-SNAPSHOT/version
+  version2.0-beta-1-SNAPSHOT/version
   packagingmaven-plugin/packaging
   nameMaven Javadoc Plugin/name
   dependencies
@@ -34,6 +54,7 @@
   roles
 roleJava Developer/role
   /roles
+  timezone-5/timezone
 /developer
   /developers
 /project

Modified: 
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=216148r1=216147r2=216148view=diff
==
--- 
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Wed Jul 13 05:28:03 2005
@@ -25,6 +25,7 @@
 import java.util.Locale;
 import java.util.StringTokenizer;
 
+import org.apache.commons.lang.ClassUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -41,7 +42,8 @@
 import org.codehaus.plexus.util.cli.DefaultConsumer;
 
 /**
- * This class provides the Javadoc report support.
+ * Generates documentation for the Java code in the project using the standard 
+ * a href=http://java.sun.com/j2se/javadoc/;Javadoc Tool/a tool.
  * 
  * @goal javadoc
  * @requiresDependencyResolution compile
@@ -57,12 +59,27 @@
 public class JavadocReport
 extends AbstractMavenReport
 {
-/** Default organization name */
-private static final String DEFAULT_ORGANIZATION_NAME = The Apache 
Software Foundation;
+/** The current class directory */
+private static final String RESOURCE_DIR = 
ClassUtils.getPackageName(JavadocReport.class).replace('.', '/');
 
+private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + 
/maven-site.vm;
+
 /** Default location for css */
-private static final String DEFAULT_STYLESHEET_LOCATION = 
org/apache/maven/plugin/javadoc/css/stylesheet.css;
-
+private static final String DEFAULT_CSS_NAME = stylesheet.css;
+private static final String RESOURCE_CSS_DIR = RESOURCE_DIR + /css;
+
+// Using for the plugin:xdoc goal. Best way?
+/** Default bottom */
+private static final String DEFAULT_BOTTOM = Copyright 
${project.inceptionYear-currentYear} ${project.organization.name}. All Rights 
Reserved.;
+/** Default bottom */
+private static final String DEFAULT_DESTDIR = 
${project.build.directory}/site/apidocs;
+/** Default doctitle */
+private static final String DEFAULT_DOCTITLE = ${windowtitle};
+/** Default organization name */
+private static final String DEFAULT_ORGANIZATION_NAME = The Apache 
Software Foundation;
+/** Default

svn commit: r218981 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/main: java/org/apache/maven/doxia/DoxiaMojo.java resources/site-plugin_en.properties resources/site-plugin_fr.properties

[vsiveton]

Author: vsiveton
Date: Wed Jul 13 21:07:08 2005
New Revision: 218981

URL: http://svn.apache.org/viewcvs?rev=218981view=rev
Log:
MNG-582: generate an index.html

Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/site-plugin_en.properties

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/site-plugin_fr.properties

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=218981r1=218980r2=218981view=diff
==
--- 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
 Wed Jul 13 21:07:08 2005
@@ -37,10 +37,12 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.SelectorUtils;
 import org.codehaus.plexus.util.StringInputStream;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -75,6 +77,26 @@
 
 private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + 
/maven-site.vm;
 
+/** Patterns which should be excluded by default. */
+private static final String[] DEFAULT_EXCLUDES = new String[] {
+// Miscellaneous typical temporary files
+**/*~, **/#*#, **/.#*, **/%*%, **/._*,
+
+// CVS
+**/CVS, **/CVS/**, **/.cvsignore,
+
+// SCCS
+**/SCCS, **/SCCS/**,
+
+// Visual SourceSafe
+**/vssver.scc,
+
+// Subversion
+**/.svn, **/.svn/**,
+
+// Mac
+**/.DS_Store };
+
 /**
  * @parameter expression=${settings}
  * @required
@@ -227,6 +249,12 @@
 
 File localeOutputDirectory = getOuputDirectory( locale );
 
+// Safety
+if ( !localeOutputDirectory.exists() )
+{
+localeOutputDirectory.mkdirs();
+}
+
 //Generate reports
 if ( reports != null )
 {
@@ -283,14 +311,14 @@
 }
 }
 
-// Generated Site Directory
+// Handle the GeneratedSite Directory
 File generatedSiteFile = new File( generatedSiteDirectory );
 if ( generatedSiteFile.exists() )
 {
 siteRenderer.render( generatedSiteFile, 
localeOutputDirectory,
  getSiteDescriptor( reports, locale ), 
template, attributes, locale );
 }
-
+
 // Generate static site
 File siteDirectoryFile;
 
@@ -305,6 +333,17 @@
 siteDirectoryFile = new File( siteDirectory, 
locale.getLanguage() );
 }
 
+// Try to generate the index.html
+if ( !indexExists( siteDirectoryFile ) ) 
+{
+getLog().info( Generate an index file. );
+generateIndexPage( getSiteDescriptor( reports, locale ), 
locale );
+}
+else
+{
+getLog().info( Ignoring the index file generation. );
+}
+
 siteRenderer.render( siteDirectoryFile, localeOutputDirectory,
  getSiteDescriptor( reports, locale ), 
template, attributes, locale );
 
@@ -484,6 +523,115 @@
 return new StringInputStream( siteDescriptorContent );
 }
 
+/**
+ * Try to find a file called index in each sub-directory from the site 
directory.
+ * We don't care about the extension.
+ * 
+ * @param siteDirectoryFile the site directory
+ * @return true if an index file was found, false otherwise
+ * @throws Exception if any
+ */
+private boolean indexExists( File siteDirectoryFile )
+throws Exception
+{
+getLog().debug( Try to find an index file in the directory=[ + 
siteDirectoryFile + ] );
+
+File[] directories = siteDirectoryFile.listFiles( new FileFilter() {
+public boolean accept(File file) {
+for ( int i = 0; i  DEFAULT_EXCLUDES.length; i++) {
+if ( SelectorUtils.matchPath( DEFAULT_EXCLUDES[i], 
file.getName() ) ) {
+return false

svn commit: r218984 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src/test: ./ projects/ projects/site-plugin-test1/ projects/site-plugin-test1/src/ projects/site-plugin-test1/src/main/ projects/site-plugin-test1/src/main/java/ projects/...

[vsiveton]

Author: vsiveton
Date: Wed Jul 13 21:17:00 2005
New Revision: 218984

URL: http://svn.apache.org/viewcvs?rev=218984view=rev
Log:
Added test cases

Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/test1/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/test1/App.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/site.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/test1/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/test1/AppTest.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/test2/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/test2/App.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src

svn commit: r218985 - in /maven/components/trunk/maven-plugins/maven-site-plugin/src: main/resources/org/apache/maven/doxia/ test/projects/site-plugin-test6/ test/projects/site-plugin-test6/src/ test/projects/site-plugin-test6/src/main/ test/projects/s...

[vsiveton]

Author: vsiveton
Date: Wed Jul 13 21:28:06 2005
New Revision: 218985

URL: http://svn.apache.org/viewcvs?rev=218985view=rev
Log:
MNG-584 and MNG-585: updated the Velocity template and added test case

Added:

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/main/java/org/apache/maven/plugin/site/test6/App.java

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/alpha/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/one/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/beta/two/index.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/apt/item.apt

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/

maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test6/src/test/java/org/apache/maven/plugin/site/test6/AppTest.java
Modified:

maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

Modified: 
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm

svn commit: r209264 - in /maven/maven-1/plugins/trunk/xdoc: src/plugin-resources/templates/project-info.xml xdocs/changes.xml

[vsiveton]

Author: vsiveton
Date: Tue Jul  5 05:04:39 2005
New Revision: 209264

URL: http://svn.apache.org/viewcvs?rev=209264view=rev
Log:
=cvs-usage link not shown in project-info page

Modified:

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml

Modified: 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml?rev=209264r1=209263r2=209264view=diff
==
--- 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
 (original)
+++ 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
 Tue Jul  5 05:04:39 2005
@@ -89,8 +89,7 @@
 This is really bad that the url requires specification 
in two
 places. Makes pluggable reporting impossible. FIX
 --
-
-#if ($project.repository.url  $project.repository.url != 
'')
+#if (($project.repository.url  $project.repository.url 
!= '') || ($project.repository.connection  $project.repository.connection != 
'') || ($project.repository.developerConnection  
$project.repository.developerConnection != ''))
 tr
 td
 a href=cvs-usage.html

Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=209264r1=209263r2=209264view=diff
==
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue Jul  5 05:04:39 2005
@@ -26,6 +26,7 @@
   /properties
   body
 release version=1.9.2-SNAPSHOT date=In SVN
+  action dev=vsiveton type=fix issue=MPXDOC-152 due-to=Arnaud 
Heritiercvs-usage link not shown in project-info page/action
   action dev=aheritier type=fixi18n : html code removed from 
bundles./action
   action dev=aheritier type=fixi18n : doc title wasn't printed in 
breadcrumbs./action
   action dev=aheritier type=fix issue=MPXDOC-151i18n : menu tag in 
xdoc does not work with key translated text id./action



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r191832 - /maven/maven-1/plugins/xdoc/

[vsiveton]

Author: vsiveton
Date: Wed Jun 22 06:25:01 2005
New Revision: 191832

URL: http://svn.apache.org/viewcvs?rev=191832view=rev
Log:
Initial import.

Added:
maven/maven-1/plugins/xdoc/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r191836 - /maven/maven-1/plugins/xdoc/

[vsiveton]

Author: vsiveton
Date: Wed Jun 22 06:33:43 2005
New Revision: 191836

URL: http://svn.apache.org/viewcvs?rev=191836view=rev
Log:
Delete

Removed:
maven/maven-1/plugins/xdoc/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r191853 - in /maven/maven-1/plugins/trunk/xdoc: plugin.jelly project.xml src/plugin-resources/navigation.jelly

[vsiveton]

Author: vsiveton
Date: Wed Jun 22 06:44:32 2005
New Revision: 191853

URL: http://svn.apache.org/viewcvs?rev=191853view=rev
Log:
Fixed bundles expression

Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/project.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly

Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?rev=191853r1=191852r2=191853view=diff
==
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Wed Jun 22 06:44:32 2005
@@ -348,7 +348,7 @@
   j:if test=${!currentLocale.equals(defaultLocale)}
 fmt:setLocale value=${currentLocale}/
   /j:if
-  fmt:setBundle basename=plugin-resources/templates/templates 
var=msg/
+  fmt:setBundle basename=plugin-resources.templates.templates 
var=msg/
   !-- User bundle --
   !-- Goal grabClassLoader should be call first --
   xdoc:grabClassLoader resource=${maven.xdoc.bundle.src}/

Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/project.xml?rev=191853r1=191852r2=191853view=diff
==
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Wed Jun 22 06:44:32 2005
@@ -22,7 +22,7 @@
   pomVersion3/pomVersion
   idmaven-xdoc-plugin/id
   nameMaven XDoc Plug-in/name
-  currentVersion1.9.1/currentVersion
+  currentVersion1.9.2-SNAPSHOT/currentVersion
   descriptionConvert xdocs into HTML./description
   shortDescriptionConvert xdocs into HTML/shortDescription
   urlhttp://maven.apache.org/reference/plugins/xdoc//url

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly?rev=191853r1=191852r2=191853view=diff
==
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly 
(original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly Wed 
Jun 22 06:44:32 2005
@@ -27,36 +27,36 @@
 body
 j:if test=${includeProjectDocumentation.equals('yes')}
 menu key=navigation.menu.project_documentation
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 item key=navigation.menu.item.about
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/index.html /
 
 !-- Only display a Downloads menu link if the 
 maven.xdoc.distributionUrl has been defined --
 j:if 
test=${context.getVariable('maven.xdoc.distributionUrl') != null}
 item key=navigation.menu.item.downloads
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/downloads.html /
 /j:if
 
 item key=navigation.menu.item.project_info
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/project-info.html collapse=true
 item key=navigation.menu.item.mailing_lists
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/mail-lists.html /
 item key=navigation.menu.item.project_team
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/team-list.html /
 item key=navigation.menu.item.dependencies
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/dependencies.html /
 
 j:set var=repository value=${pom.repository} /
 j:if test=${!empty(repository)}
 item key=navigation.menu.item.source_repository
-bundle=plugin-resources/templates/templates
+bundle=plugin-resources.templates.templates
 href=/cvs-usage.html /
 /j:if
 
@@ -64,12

svn commit: r191720 - in /maven/maven-1/plugins/trunk/xdoc: src/plugin-resources/templates/ src/plugin-resources/templates/scm/ xdocs/

[vsiveton]

Author: vsiveton
Date: Tue Jun 21 13:23:17 2005
New Revision: 191720

URL: http://svn.apache.org/viewcvs?rev=191720view=rev
Log:
MPXDOC-148: fixed bundles expression

Modified:

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/project-info.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/scm/cvs.xml

maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml

Modified: 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml?rev=191720r1=191719r2=191720view=diff
==
--- 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml 
(original)
+++ 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/cvs-usage.xml 
Tue Jun 21 13:23:17 2005
@@ -21,7 +21,7 @@
 document
 properties
 title key=template.cvs_usage.title
-bundle=plugin-resources\templates\templates /
+bundle=plugin-resources.templates.templates /
 /properties
 
 body
@@ -29,17 +29,17 @@
 
 #if (!$repository)
 section key=template.cvs_usage.section1.title
-bundle=plugin-resources\templates\templates
+bundle=plugin-resources.templates.templates
 p
 message key=template.cvs_usage.section1.no_repository
-bundle=plugin-resources\templates\templates /
+bundle=plugin-resources.templates.templates /
 /p
 /section
 #else
   #if ($repository.url  $repository.url != '')
 #set ($url = $escape.getText($repository.url))
   section key=template.cvs_usage.section2.title
-  bundle=plugin-resources\templates\templates
+  bundle=plugin-resources.templates.templates
   p
   a href=$url$url/a
   /p
@@ -54,10 +54,10 @@
 #set ($module = 
$scmUtil.getCvsModule($repository.connection))
 
   section key=template.cvs_usage.section3.title
-  bundle=plugin-resources\templates\templates
+  bundle=plugin-resources.templates.templates
   p
   message key=template.cvs_usage.section3.description
-  bundle=plugin-resources\templates\templates /
+  bundle=plugin-resources.templates.templates /
   /p
 
   source
@@ -72,10 +72,10 @@
   /section
 
   section key=template.cvs_usage.section4.title
-  bundle=plugin-resources\templates\templates
+  bundle=plugin-resources.templates.templates
   p
   message key=template.cvs_usage.section4.description
-  bundle=plugin-resources\templates\templates /
+  bundle=plugin-resources.templates.templates /
   /p
 
   p
@@ -86,7 +86,7 @@
 
   p
   message key=template.cvs_usage.section4.updates
-  bundle=plugin-resources\templates\templates /
+  bundle=plugin-resources.templates.templates /
   /p
   /section
 #end 
@@ -101,10 +101,10 @@
 #set ($server = 
$scmUtil.getCvsServer($repository.developerConnection))
 
   section key=template.cvs_usage.section5.title
-  bundle=plugin-resources\templates\templates
+  bundle=plugin-resources.templates.templates
   p
   message key=template.cvs_usage.section5.description
-  bundle=plugin-resources\templates\templates /
+  bundle=plugin-resources.templates.templates /
   /p
 
   source
@@ -120,16 +120,16 @@
 
   p
   message key=template.cvs_usage.section5.remember
-  bundle=plugin-resources\templates\templates /
+  bundle=plugin-resources.templates.templates /
   /p
   /section
 
   section key=template.cvs_usage.section6.title
-  bundle=plugin-resources\templates\templates

svn commit: r190742 - /maven/maven-1/plugins/trunk/xdoc/project.xml

[vsiveton]

Author: vsiveton
Date: Wed Jun 15 05:45:04 2005
New Revision: 190742

URL: http://svn.apache.org/viewcvs?rev=190742view=rev
Log:
Adding myself as dev

Modified:
maven/maven-1/plugins/trunk/xdoc/project.xml

Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/project.xml?rev=190742r1=190741r2=190742view=diff
==
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Wed Jun 15 05:45:04 2005
@@ -148,14 +148,16 @@
   /roles
   timezone-3/timezone
 /developer
-  /developers
-  contributors
-contributor
+developer
   nameVincent Siveton/name
+  idvsiveton/id
   email[EMAIL PROTECTED]/email
+  roles
+roleJava Developer/role
+  /roles
   timezone-5/timezone
-/contributor
-  /contributors
+/developer
+  /developers
   dependencies
 dependency
   groupIddom4j/groupId



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]