Author: vsiveton
Date: Wed Jun 22 06:44:32 2005
New Revision: 191853
URL: http://svn.apache.org/viewcvs?rev=191853&view=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=191853&r1=191852&r2=191853&view=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=191853&r1=191852&r2=191853&view=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 @@
<pomVersion>3</pomVersion>
<id>maven-xdoc-plugin</id>
<name>Maven XDoc Plug-in</name>
- <currentVersion>1.9.1</currentVersion>
+ <currentVersion>1.9.2-SNAPSHOT</currentVersion>
<description>Convert xdocs into HTML.</description>
<shortDescription>Convert xdocs into HTML</shortDescription>
<url>http://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=191853&r1=191852&r2=191853&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 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 +64,12 @@
value="${pom.issueTrackingUrl}" />
<j:if test="${!empty(url)}">
<item key="navigation.menu.item.issue_tracking"
- bundle="plugin-resources/templates/templates"
+ bundle="plugin-resources.templates.templates"
href="/issue-tracking.html" />
</j:if>
</item>
<item key="navigation.menu.item.project_reports"
- bundle="plugin-resources/templates/templates"
+ bundle="plugin-resources.templates.templates"
href="/maven-reports.html" collapse="true">
<j:forEach var="report" items="${reports}">
<j:set var="link" value="${report.link}" />
@@ -92,7 +92,7 @@
</util:available>
<j:if test="${devProcess}">
<item key="navigation.menu.item.development_process"
- bundle="plugin-resources/templates/templates"
+ bundle="plugin-resources.templates.templates"
href="/development-process.html" />
</j:if>
<j:if test="${!devProcess}">
@@ -100,7 +100,7 @@
value="${maven.xdoc.developmentProcessUrl}" />
<j:if test="${!empty(devProcessUrl)}">
<item
key="navigation.menu.item.development_process"
- bundle="plugin-resources/templates/templates"
+ bundle="plugin-resources.templates.templates"
href="${devProcessUrl}" />
</j:if>
</j:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
