You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ah...@apache.org on 2005/09/04 01:15:33 UTC
svn commit: r267513 - in /maven/maven-1/plugins/trunk/xdoc:
src/plugin-resources/ src/plugin-resources/templates/ xdocs/
Author: aheritier
Date: Sat Sep 3 16:15:14 2005
New Revision: 267513
URL: http://svn.apache.org/viewcvs?rev=267513&view=rev
Log:
MPXDOC-155 : xdoc plugin >= 1.9 not compatible with older customised site.jsl
Patch submitted by : Lukas Theussl
Patch reviewed by : Arnaud Heritier
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly
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/team-list.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
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=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/navigation.jelly Sat Sep 3 16:15:14 2005
@@ -27,37 +27,38 @@
<body>
<j:if test="${includeProjectDocumentation.equals('yes')}">
<menu key="navigation.menu.project_documentation"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Project Documentation">
<item key="navigation.menu.item.about"
bundle="plugin-resources.templates.templates"
- href="/index.html" />
+ name="About ${pom.name}" 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"
- href="/downloads.html" />
+ name="Downloads" href="/downloads.html" />
</j:if>
<item key="navigation.menu.item.project_info"
bundle="plugin-resources.templates.templates"
- href="/project-info.html" collapse="true">
+ name="Project Info" href="/project-info.html" collapse="true">
<item key="navigation.menu.item.mailing_lists"
bundle="plugin-resources.templates.templates"
- href="/mail-lists.html" />
+ name="Mailing Lists" href="/mail-lists.html" />
<item key="navigation.menu.item.project_team"
bundle="plugin-resources.templates.templates"
- href="/team-list.html" />
+ name="Project Team" href="/team-list.html" />
<item key="navigation.menu.item.dependencies"
bundle="plugin-resources.templates.templates"
- href="/dependencies.html" />
+ name="Dependencies" 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"
- href="/cvs-usage.html" />
+ name="Source Repository" href="/cvs-usage.html" />
</j:if>
<j:set var="url"
@@ -65,12 +66,12 @@
<j:if test="${!empty(url)}">
<item key="navigation.menu.item.issue_tracking"
bundle="plugin-resources.templates.templates"
- href="/issue-tracking.html" />
+ name="Issue Tracking" href="/issue-tracking.html" />
</j:if>
</item>
<item key="navigation.menu.item.project_reports"
bundle="plugin-resources.templates.templates"
- href="/maven-reports.html" collapse="true">
+ name="Project Reports" href="/maven-reports.html" collapse="true">
<j:forEach var="report" items="${reports}">
<j:set var="link" value="${report.link}" />
<j:set var="externalLink" value="${report.externalLink}" />
@@ -93,7 +94,7 @@
<j:if test="${devProcess}">
<item key="navigation.menu.item.development_process"
bundle="plugin-resources.templates.templates"
- href="/development-process.html" />
+ name="Development Process" href="/development-process.html" />
</j:if>
<j:if test="${!devProcess}">
<j:set var="devProcessUrl"
@@ -101,7 +102,7 @@
<j:if test="${!empty(devProcessUrl)}">
<item key="navigation.menu.item.development_process"
bundle="plugin-resources.templates.templates"
- href="${devProcessUrl}" />
+ name="Development Process" href="${devProcessUrl}" />
</j:if>
</j:if>
</menu>
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=267513&r1=267512&r2=267513&view=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 Sat Sep 3 16:15:14 2005
@@ -21,7 +21,10 @@
<document>
<properties>
<title key="template.cvs_usage.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.cvs_usage.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
@@ -29,7 +32,8 @@
#if (!$repository)
<section key="template.cvs_usage.section1.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Repository">
<p>
<message key="template.cvs_usage.section1.no_repository"
bundle="plugin-resources.templates.templates" />
@@ -39,7 +43,8 @@
#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"
+ name="Web Access">
<p>
<a href="$url">$url</a>
</p>
@@ -54,7 +59,8 @@
#set ($module = $scmUtil.getCvsModule($repository.connection))
<section key="template.cvs_usage.section3.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Anonymous Access with Maven">
<p>
<message key="template.cvs_usage.section3.description"
bundle="plugin-resources.templates.templates" />
@@ -72,7 +78,8 @@
</section>
<section key="template.cvs_usage.section4.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Anonymous CVS Access">
<p>
<message key="template.cvs_usage.section4.description"
bundle="plugin-resources.templates.templates" />
@@ -101,7 +108,8 @@
#set ($server = $scmUtil.getCvsServer($repository.developerConnection))
<section key="template.cvs_usage.section5.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Developer Access with Maven">
<p>
<message key="template.cvs_usage.section5.description"
bundle="plugin-resources.templates.templates" />
@@ -125,7 +133,8 @@
</section>
<section key="template.cvs_usage.section6.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Developer CVS Access via SSH">
<p>
<message key="template.cvs_usage.section6.description"
@@ -152,7 +161,8 @@
#if ($connscm == 'cvs')
<section key="template.cvs_usage.section7.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="CVS Access behind a firewall">
<p>
<message key="template.cvs_usage.section7.description1"
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml Sat Sep 3 16:15:14 2005
@@ -21,12 +21,16 @@
<document>
<properties>
<title key="template.dependencies.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.dependencies.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
<section key="template.dependencies.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Dependencies">
#if ($project.dependencies.size() == 0)
<p>
<message key="template.dependencies.section.no_dependency"
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/issue-tracking.xml Sat Sep 3 16:15:14 2005
@@ -21,12 +21,16 @@
<document>
<properties>
<title key="template.issue_tracking.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.issue_tracking.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
<section key="template.issue_tracking.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Issue Tracking">
<p>
#if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
#set ($url = $escape.getText($project.issueTrackingUrl))
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/mail-lists.xml Sat Sep 3 16:15:14 2005
@@ -36,12 +36,16 @@
<document>
<properties>
<title key="template.mail_lists.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.mail_lists.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
<section key="template.mail_lists.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Mailing Lists">
#if ($project.mailingLists.size() == 0)
<p>
<message key="template.mail_lists.section.no_mail_list"
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/maven-reports.xml Sat Sep 3 16:15:14 2005
@@ -21,12 +21,16 @@
<document>
<properties>
<title key="template.maven_reports.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.maven_reports.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
<section key="template.maven_reports.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Maven Generated Reports">
<p>
<message key="template.maven_reports.section.maven_reports1"
bundle="plugin-resources.templates.templates" />
@@ -39,7 +43,8 @@
#set ($currentLocale = $project.getPluginContext('maven-xdoc-plugin').getVariable('currentLocale'))
<subsection key="template.maven_reports.section.subsection.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Overview">
<table>
<tr>
<th>
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=267513&r1=267512&r2=267513&view=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 Sat Sep 3 16:15:14 2005
@@ -21,12 +21,16 @@
<document>
<properties>
<title key="template.project_info.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.project_info.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<body>
<section key="template.project_info.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="General Project Information">
<p>
<message key="template.project_info.section.project_information1"
bundle="plugin-resources.templates.templates" />
@@ -36,7 +40,8 @@
</p>
<subsection key="template.project_info.section.subsection.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Overview">
<table>
<tr>
<th>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml Sat Sep 3 16:15:14 2005
@@ -21,7 +21,10 @@
<document>
<properties>
<title key="template.team_list.title"
- bundle="plugin-resources.templates.templates" />
+ bundle="plugin-resources.templates.templates" >
+ <message key="template.team_list.title"
+ bundle="plugin-resources.templates.templates" />
+ </title>
</properties>
<head>
@@ -51,7 +54,8 @@
<body onload="init();">
<section key="template.team_list.section.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="The Team">
<p>
<message key="template.team_list.section.description1"
bundle="plugin-resources.templates.templates" />
@@ -63,7 +67,8 @@
</p>
<subsection key="template.team_list.section.members.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Members">
#if ($project.developers.size() == 0)
<p>
<message
@@ -151,7 +156,8 @@
</subsection>
<subsection
key="template.team_list.section.contributors.title"
- bundle="plugin-resources.templates.templates">
+ bundle="plugin-resources.templates.templates"
+ name="Contributors">
#if ($project.contributors.size() == 0)
<p>
<message key="template.team_list.section.no_contributor"
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties?rev=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties Sat Sep 3 16:15:14 2005
@@ -106,7 +106,7 @@
template.project_info.section.subsection.description.issue_tracking=This is a link to the issue tracking system for this project. Issues (bugs, features, change requests) can be created and queried using this link.
# For team-list.xml
-template.team_list.title=Team list
+template.team_list.title=Project Team
template.team_list.section.title=The Team
template.team_list.section.description1=A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
template.team_list.section.description2=The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
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=267513&r1=267512&r2=267513&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sat Sep 3 16:15:14 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.9.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPXDOC-155" due-to="Lukas Theussl">Xdoc plugin >= 1.9 not compatible with older customised site.jsl.</action>
<action dev="aheritier" type="fix" issue="MPXDOC-154" due-to="Juan F. Codagnone,Vincent Siveton,Lukas Theussl">System locale setting makes test cases fail.</action>
<action dev="vsiveton" type="fix" issue="MPXDOC-152" due-to="Arnaud Heritier">cvs-usage link not shown in project-info page</action>
<action dev="aheritier" type="fix" issue="MPXDOC-151">i18n : menu tag in xdoc does not work with "key" translated text id.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org