You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/20 20:51:23 UTC
svn commit: r290526 - in /maven/maven-1/plugins/trunk/multiproject:
plugin.jelly src/plugin-resources/templates/projects-overview.jelly
src/plugin-resources/templates/projects-overview.xml xdocs/changes.xml
Author: ltheussl
Date: Tue Sep 20 11:51:20 2005
New Revision: 290526
URL: http://svn.apache.org/viewcvs?rev=290526&view=rev
Log:
MPMULTIPROJECT-44: use jelly for overview page template
Added:
maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.jelly
Removed:
maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.xml
Modified:
maven/maven-1/plugins/trunk/multiproject/plugin.jelly
maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/multiproject/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multiproject/plugin.jelly?rev=290526&r1=290525&r2=290526&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/multiproject/plugin.jelly Tue Sep 20 11:51:20 2005
@@ -186,13 +186,12 @@
<j:if test="${overviewPageCreate=='true'}">
<ant:echo>Creating overview page</ant:echo>
<j:set var="encoding" value="${maven.docs.outputencoding}"/>
- <velocity:merge
- name="${maven.gen.docs}/${overviewPageLink}.xml"
- basedir="${maven.multiproject.templates}"
- template="projects-overview.xml"
- inputEncoding="${encoding}"
- outputEncoding="${encoding}"
- />
+ <doc:jslFile
+ output="${maven.gen.docs}/${overviewPageLink}.xml"
+ stylesheet="${plugin.resources}/templates/projects-overview.jelly"
+ encoding="${encoding}"
+ outputMode="xml"
+ prettyPrint="true"/>
</j:if>
</goal>
Added: maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.jelly?rev=290526&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.jelly (added)
+++ maven/maven-1/plugins/trunk/multiproject/src/plugin-resources/templates/projects-overview.jelly Tue Sep 20 11:51:20 2005
@@ -0,0 +1,63 @@
+<?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:j="jelly:core"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:x="jelly:xml">
+
+ <document>
+
+ <properties>
+ <title>${overviewPageTitle}</title>
+ </properties>
+
+ <body>
+ <section name="${overviewPageTitle}">
+ <p>
+ <j:if test="${!empty(overviewPageText)}">
+ ${overviewPageText}
+ </j:if>
+ </p>
+
+ <table>
+ <j:forEach var="project" items="${multiprojects}">
+ <tr>
+ <j:choose>
+ <j:when test="${navType == 'aggregate'}">
+ <th><a href="${aggregateDir}${project.artifactId}/index.html">${project.name}</a></th>
+ </j:when>
+ <j:otherwise>
+ <th><a href="${project.url}">${project.name}</a></th>
+ </j:otherwise>
+ </j:choose>
+ <td>${project.shortDescription}</td>
+ </tr>
+ </j:forEach>
+ </table>
+
+ </section>
+ </body>
+
+ </document>
+</project>
Modified: maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml?rev=290526&r1=290525&r2=290526&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml Tue Sep 20 11:51:20 2005
@@ -26,7 +26,8 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in SVN">
- <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals</action>
+ <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-44">multiproject:site fails if sub-projects has a &amp; on POM.</action>
+ <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals.</action>
</release>
<release version="1.4.1" date="2005-06-07">
<action dev="vmassol" type="fix">Set version of the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org