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 02:41:14 UTC
svn commit: r267528 - in /maven/maven-1/plugins/trunk/xdoc:
src/plugin-resources/templates/ src/plugin-test/testDependenciesComment/
xdocs/
Author: aheritier
Date: Sat Sep 3 17:41:06 2005
New Revision: 267528
URL: http://svn.apache.org/viewcvs?rev=267528&view=rev
Log:
MPXDOC-163 : Dependencies comment (MPXDOC-129) feature disappeared.
Tests are re-enabled.
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/dependencies.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates.properties
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_de.properties
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_fr.properties
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
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=267528&r1=267527&r2=267528&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 17:41:06 2005
@@ -60,6 +60,10 @@
<message key="template.dependencies.section.url"
bundle="plugin-resources.templates.templates" />
</th>
+ <th>
+ <message key="template.dependencies.section.comment"
+ bundle="plugin-resources.templates.templates" />
+ </th>
</tr>
</thead>
<tbody>
@@ -71,6 +75,11 @@
<td>
#if ($dep.Url)
<a href="${dep.Url}">${dep.Url}</a>
+ #end
+ </td>
+ <td>
+ #if(${dep.comment})
+ ${dep.comment}
#end
</td>
</tr>
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=267528&r1=267527&r2=267528&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 17:41:06 2005
@@ -61,6 +61,7 @@
template.dependencies.section.type=Type
template.dependencies.section.version=Version
template.dependencies.section.url=URL
+template.dependencies.section.comment=Comment
# For issue-tracking.xml
template.issue_tracking.title=Issue Tracking
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_de.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_de.properties?rev=267528&r1=267527&r2=267528&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_de.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_de.properties Sat Sep 3 17:41:06 2005
@@ -63,6 +63,7 @@
template.dependencies.section.type = Typ
template.dependencies.section.version = Version
template.dependencies.section.url = URL
+template.dependencies.section.comment=Kommentar
# For issue-tracking.xml
template.issue_tracking.title = Fehlerbehandlung
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_fr.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_fr.properties?rev=267528&r1=267527&r2=267528&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_fr.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/templates_fr.properties Sat Sep 3 17:41:06 2005
@@ -63,6 +63,7 @@
template.dependencies.section.type=Type
template.dependencies.section.version=Version
template.dependencies.section.url=URL
+template.dependencies.section.comment=Commentaire
# For issue-tracking.xml
template.issue_tracking.title=Suivi des incidents
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml?rev=267528&r1=267527&r2=267528&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml Sat Sep 3 17:41:06 2005
@@ -15,40 +15,30 @@
* limitations under the License.
*/
-->
-<project default="testPlugin"
- xmlns:util="jelly:util"
- xmlns:j="jelly:core"
- xmlns:assert="assert"
- xmlns:doc="doc"
- xmlns:x="jelly:xml">
-
+<project default="testPlugin" xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:doc="doc" xmlns:x="jelly:xml">
<goal name="testPlugin" prereqs="clean,xdoc:generate-from-pom, dependenciesTest"/>
-
<goal name="dependenciesTest">
<j:set var="depXmlPath" value="${maven.gen.docs}/dependencies.xml"/>
<assert:assertFileExists file="${depXmlPath}"/>
<util:file var="depXmlFile" name="${depXmlPath}"/>
<x:parse var="depXmlDom" xml="${depXmlFile}"/>
-<!--
<x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[5])"/>
<assert:assertEquals expected="Comment" value="${headerComment}"/>
<x:forEach var="tr" select="$depXmlDom/document/body/section[@name='Dependencies']/table/tbody/*">
<x:set var="depName" select="string($tr/td[1])"/>
<x:set var="comment" select="string($tr/td[5])"/>
<j:if test="${depName=='dom4j'}">
- <echo>Checking comment for dependency dom4j</echo>
- <assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
+ <echo>Checking comment for dependency dom4j</echo>
+ <assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
</j:if>
<j:if test="${depName=='commons-jelly'}">
- <echo>Checking comment for dependency commons-jelly</echo>
- <assert:assertEquals expected="" value="${comment.trim()}"/>
+ <echo>Checking comment for dependency commons-jelly</echo>
+ <assert:assertEquals expected="" value="${comment.trim()}"/>
</j:if>
<j:if test="${depName=='velocity-dvsl'}">
- <echo>Checking comment for dependency velocity-dvsl</echo>
- <assert:assertEquals expected="" value="${comment.trim()}"/>
+ <echo>Checking comment for dependency velocity-dvsl</echo>
+ <assert:assertEquals expected="" value="${comment.trim()}"/>
</j:if>
</x:forEach>
--->
</goal>
-
</project>
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=267528&r1=267527&r2=267528&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sat Sep 3 17:41:06 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.9.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPXDOC-163">Dependencies comment (MPXDOC-129) feature disappeared.</action>
<action dev="aheritier" type="fix" issue="MPXDOC-162" due-to="Lukas Theussl">Special characters in menu ids aren't escaped.</action>
<action dev="aheritier" type="fix" issue="MPXDOC-156" due-to="Jeff Jensen">Add documentation about "external links" and "new windows".</action>
<action dev="aheritier" type="fix" issue="MPXDOC-155" due-to="Lukas Theussl">Xdoc plugin >= 1.9 not compatible with older customised site.jsl.</action>
@@ -39,7 +40,7 @@
<action dev="aheritier" type="add" issue="MPXDOC-131" due-to="Ignacio G. Mac Dowell">Allow i18n links.</action>
<action dev="aheritier" type="fix">i18n : html code removed from bundles.</action>
<action dev="aheritier" type="fix">i18n : doc title wasn't printed in breadcrumbs.</action>
- <action dev="aheritier" type="update">breadcrumbs : add a link to the site on the project name.</action>
+ <action dev="aheritier" type="update">breadcrumbs : add a link to the site on the project name.</action>
</release>
<release version="1.9.1" date="2005-06-16">
<action dev="brett" type="fix">Don't override the Maven library. This makes the plugin compatible with both Maven 1.0.2 and Maven 1.1</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org