commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r888217 - in /commons/proper/commons-build-plugin/trunk/src/main: resources/commons-xdoc-templates/ scripts/
Date Tue, 08 Dec 2009 01:25:45 GMT
Author: niallp
Date: Tue Dec  8 01:25:42 2009
New Revision: 888217

URL: http://svn.apache.org/viewvc?rev=888217&view=rev
Log:
COMMONSSITE-48 provide a facility to add a second release to the download page

Added:
    commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
      - copied, changed from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
    commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
      - copied, changed from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
    commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
      - copied, changed from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
Removed:
    commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
Modified:
    commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
    commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml

Copied: commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
(from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml)
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml?p2=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml&p1=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml&r1=887867&r2=888217&rev=888217&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
Tue Dec  8 01:25:42 2009
@@ -1,102 +1,4 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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.
--->
-<!--
- +======================================================================+
- |****                                                              ****|
- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
- |****                    DO NOT EDIT DIRECTLY                      ****|
- |****                                                              ****|
- +======================================================================+
- | TEMPLATE FILE: download-page-template.xml                            |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- |                                                                      |
- | 1) Re-generate using: mvn commons:download-page                      |
- |                                                                      |
- | 2) Set the following properties in the component's pom:              |
- |    - commons.componentid (required, alphabetic, lower case)          |
- |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
- |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
- |                                                                      |
- | 3) Example Properties                                                |
- |                                                                      |
- |  <properties>                                                        |
- |    <commons.componentid>math</commons.componentid>                   |
- |    <commons.release.version>1.2</commons.release.version>            |
- |  </properties>                                                       |
- |                                                                      |
- +======================================================================+
--->
-<document>
-  <properties>
-    <title>Download @NAME@</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
-  </properties>
-  <body>
-    <section name="Download @NAME@">
-      <p>
-        We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
-        the downloaded files using signatures downloaded from our main 
-        distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
-      </p>
-
-      <p>
-        You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.
-        <br></br>
-        [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
-      </p>
-
-      <form action="[location]" method="get" id="SelectMirror">
-        <p>
-          Other mirrors: 
-          <select name="Preferred">
-          [if-any http]
-            [for http]<option value="[http]">[http]</option>[end]
-          [end]
-          [if-any ftp]
-            [for ftp]<option value="[ftp]">[ftp]</option>[end]
-          [end]
-          [if-any backup]
-            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-          [end]
-          </select>
-          <input type="submit" value="Change"></input>
-        </p>
-      </form>
-
-      <p>
-        The <code>KEYS</code> link links to the code signing keys used to sign
the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature
from our main site. 
-        The <code>MD5</code> link downloads the checksum from the main site.
-      </p>
-
-      <p>
-        For more information concerning @NAME@, see the 
-        <a href="index.html" class="name">@NAME@</a> web site.
-      </p>
-
+    <subsection name="@NAME@ @VERSION@ @RELDESC@">
       <p>
         <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
         <ul class="downloads">
@@ -136,10 +38,6 @@
               </li>
             </ul>
           </li>
-          <li class="download"><a href="[preferred]/commons/@ID@/">browse download
area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/@ID@/">archives...</a></li>
         </ul>
       </p>
-    </section>
-  </body>
-</document>
+    </subsection>

Copied: commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
(from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml)
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml?p2=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml&p1=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml&r1=887867&r2=888217&rev=888217&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
Tue Dec  8 01:25:42 2009
@@ -1,145 +1,12 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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.
--->
-<!--
- +======================================================================+
- |****                                                              ****|
- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
- |****                    DO NOT EDIT DIRECTLY                      ****|
- |****                                                              ****|
- +======================================================================+
- | TEMPLATE FILE: download-page-template.xml                            |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- |                                                                      |
- | 1) Re-generate using: mvn commons:download-page                      |
- |                                                                      |
- | 2) Set the following properties in the component's pom:              |
- |    - commons.componentid (required, alphabetic, lower case)          |
- |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
- |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
- |                                                                      |
- | 3) Example Properties                                                |
- |                                                                      |
- |  <properties>                                                        |
- |    <commons.componentid>math</commons.componentid>                   |
- |    <commons.release.version>1.2</commons.release.version>            |
- |  </properties>                                                       |
- |                                                                      |
- +======================================================================+
--->
-<document>
-  <properties>
-    <title>Download @NAME@</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
-  </properties>
-  <body>
-    <section name="Download @NAME@">
-      <p>
-        We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
-        the downloaded files using signatures downloaded from our main 
-        distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
-      </p>
-
-      <p>
-        You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.
-        <br></br>
-        [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
-      </p>
-
-      <form action="[location]" method="get" id="SelectMirror">
+    <subsection name="Browse Download Area and Archives">
         <p>
-          Other mirrors: 
-          <select name="Preferred">
-          [if-any http]
-            [for http]<option value="[http]">[http]</option>[end]
-          [end]
-          [if-any ftp]
-            [for ftp]<option value="[ftp]">[ftp]</option>[end]
-          [end]
-          [if-any backup]
-            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-          [end]
-          </select>
-          <input type="submit" value="Change"></input>
+          Older releases can be obtained from the archives.
         </p>
-      </form>
-
-      <p>
-        The <code>KEYS</code> link links to the code signing keys used to sign
the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature
from our main site. 
-        The <code>MD5</code> link downloads the checksum from the main site.
-      </p>
-
-      <p>
-        For more information concerning @NAME@, see the 
-        <a href="index.html" class="name">@NAME@</a> web site.
-      </p>
-
-      <p>
-        <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
-        <ul class="downloads">
-          <li class="group"><div class="links"><span class="label">Binary</span></div>
-            <ul>
-              <li class="download"><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@VERSION@.tar.gz</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-              <li class="download"><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip">@VERSION@.zip</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li class="group"><div class="links"><span class="label">Source</span></div>
-            <ul>
-              <li class="download"><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.tar.gz">@VERSION@.tar.gz</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-              <li class="download"><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.zip">@VERSION@.zip</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
+        <ul>
           <li class="download"><a href="[preferred]/commons/@ID@/">browse download
area</a></li>
           <li><a href="http://archive.apache.org/dist/commons/@ID@/">archives...</a></li>
         </ul>
-      </p>
+    </subsection>
     </section>
   </body>
 </document>

Copied: commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
(from r887867, commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml)
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml?p2=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml&p1=commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml&r1=887867&r2=888217&rev=888217&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-template.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
Tue Dec  8 01:25:42 2009
@@ -50,6 +50,7 @@
   </properties>
   <body>
     <section name="Download @NAME@">
+    <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
         builds, but you <strong>must</strong> verify the integrity of
@@ -91,55 +92,4 @@
         The <code>PGP</code> link downloads the OpenPGP compatible signature
from our main site. 
         The <code>MD5</code> link downloads the checksum from the main site.
       </p>
-
-      <p>
-        For more information concerning @NAME@, see the 
-        <a href="index.html" class="name">@NAME@</a> web site.
-      </p>
-
-      <p>
-        <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
-        <ul class="downloads">
-          <li class="group"><div class="links"><span class="label">Binary</span></div>
-            <ul>
-              <li class="download"><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@VERSION@.tar.gz</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-              <li class="download"><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip">@VERSION@.zip</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li class="group"><div class="links"><span class="label">Source</span></div>
-            <ul>
-              <li class="download"><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.tar.gz">@VERSION@.tar.gz</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-              <li class="download"><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.zip">@VERSION@.zip</a>
-                <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.asc">pgp</a>]</span>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li class="download"><a href="[preferred]/commons/@ID@/">browse download
area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/@ID@/">archives...</a></li>
-        </ul>
-      </p>
-    </section>
-  </body>
-</document>
+    </subsection>

Modified: commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml?rev=888217&r1=888216&r2=888217&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml (original)
+++ commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml Tue
Dec  8 01:25:42 2009
@@ -25,7 +25,7 @@
     <property name="commonsMojoId"      value="Commons:xdoc-generate" />
     <property name="commonsMojoXdocDir" value="resources/commons-xdoc-templates" />
     <property name="commonsMojoTempDir" value="target/commons-generated-xdocs" />
-    <property name="level"              value="debug" />
+    <property name="level"              value="info" />
 
     <!-- ========== Generate Issue Tracking Page ============================== -->
 
@@ -110,7 +110,9 @@
         <echo level="${level}" message="project.name           : ${project.name}" />
         <echo level="${level}" message="commons.componentid    : ${commons.componentid}"
/>
         <echo level="${level}" message="commons.release.version: ${commons.release.version}"
/>
-        <echo level="${level}" message="commons.release.name   : ${commons.release.name}"
/>
+        <echo level="${level}" message="commons.release.version.2: ${commons.release.version.2}"
/>
+        <echo level="${level}" message="commons.release.desc   : ${commons.release.desc}"
/>
+        <echo level="${level}" message="commons.release.desc.2 : ${commons.release.desc.2}"
/>
         <echo level="${level}" message="commons.binary.suffix  : ${commons.binary.suffix}"
/>
         <echo level="${level}" message="----- commons:download-page - Parameters - END
  -----" />
 
@@ -121,18 +123,10 @@
 
         <!-- Load the dowload-page template from mojo resources to temp directory -->
         <antcall target="load-no-download-page-template"/>
-        <antcall target="load-download-page-template"/>
-
-        <!-- Copy the download page template filtering to replace properties -->
-        <copy file="${commonsMojoTempDir}/download-page-template.xml" tofile="${commonsMojoTempDir}/download_${commons.componentid}.xml"
overwrite="true">
-            <filterset>
-            <filter  token="NAME"          value="${project.name}"/>
-            <filter  token="ID"            value="${commons.componentid}"/>
-            <filter  token="VERSION"       value="${commons.release.version}"/>
-            <filter  token="FINAL_NAME"    value="${commons.release.name}"/>
-            <filter  token="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
-            </filterset>
-        </copy>
+        <antcall target="load-download-page-head"/>
+        <antcall target="load-download-page-body-1"/>
+        <antcall target="load-download-page-body-2"/>
+        <antcall target="load-download-page-foot"/>
 
         <!-- copy to either m1 or m2 xdoc directory -->
         <antcall target="copy-to-xdoc-dir">
@@ -140,12 +134,78 @@
         </antcall>
     </target>
 
-    <target name="load-download-page-template" if="commons.release.version">
-        <echo  level="info" message="*** copying download-page-template.xml ***" />
-        <loadresource property="downloadpage-xml">
-            <javaresource name="${commonsMojoXdocDir}/download-page-template.xml"/>
+    <target name="load-download-page-head" if="commons.release.version">
+        <echo  level="info" message="*** loading download-page header file ***" />
+
+        <!-- Load header -->
+        <loadresource property="download-page-head-xml">
+            <javaresource name="${commonsMojoXdocDir}/download-page-head.xml"/>
+            <filterchain>
+                <replacetokens>
+                    <token key="NAME" value="${project.name}"/>
+                </replacetokens>
+            </filterchain>
         </loadresource>
-        <echo message="${downloadpage-xml}" file="${commonsMojoTempDir}/download-page-template.xml"
append="false" />
+        <echo message="${download-page-head-xml}" file="${commonsMojoTempDir}/download_${commons.componentid}.xml"
append="false" />
+
+    </target>
+
+    <target name="load-download-page-body-1" if="commons.release.version">
+        <echo  level="info" message="*** loading download-page body(1) file***" />
+
+        <!-- Load Body -->
+        <loadresource property="download-page-body-1-xml">
+            <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
+            <filterchain>
+                <replacetokens>
+                    <token key="VERSION"       value="${commons.release.version}"/>
+                    <token key="RELDESC"       value="${commons.release.desc}"/>
+                    <token key="NAME"          value="${project.name}"/>
+                    <token key="ID"            value="${commons.componentid}"/>
+                    <token key="FINAL_NAME"    value="${project.artifactId}-${commons.release.version}"/>
+                    <token key="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
+                </replacetokens>
+            </filterchain>
+        </loadresource>
+        <echo message="${download-page-body-1-xml}" file="${commonsMojoTempDir}/download_${commons.componentid}.xml"
append="true" />
+
+    </target>
+
+    <target name="load-download-page-body-2" if="commons.release.version.2">
+        <echo  level="info" message="*** loading download-page body(2) file***" />
+
+        <!-- Load Body -->
+        <loadresource property="download-page-body-2-xml">
+            <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
+            <filterchain>
+                <replacetokens>
+                    <token key="VERSION"       value="${commons.release.version.2}"/>
+                    <token key="RELDESC"       value="${commons.release.desc.2}"/>
+                    <token key="NAME"          value="${project.name}"/>
+                    <token key="ID"            value="${commons.componentid}"/>
+                    <token key="FINAL_NAME"    value="${project.artifactId}-${commons.release.version.2}"/>
+                    <token key="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
+                </replacetokens>
+            </filterchain>
+        </loadresource>
+        <echo message="${download-page-body-2-xml}" file="${commonsMojoTempDir}/download_${commons.componentid}.xml"
append="true" />
+
+    </target>
+
+    <target name="load-download-page-foot" if="commons.release.version">
+        <echo  level="info" message="*** loading download-page footer files ***" />
+
+        <!-- Load Footer -->
+        <loadresource property="download-page-foot-xml">
+            <javaresource name="${commonsMojoXdocDir}/download-page-foot.xml"/>
+            <filterchain>
+                <replacetokens>
+                    <token key="ID"            value="${commons.componentid}"/>
+                </replacetokens>
+            </filterchain>
+        </loadresource>
+        <echo message="${download-page-foot-xml}" file="${commonsMojoTempDir}/download_${commons.componentid}.xml"
append="true" />
+
     </target>
 
     <target name="load-no-download-page-template" unless="commons.release.version">

Modified: commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml?rev=888217&r1=888216&r2=888217&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml (original)
+++ commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml Tue
Dec  8 01:25:42 2009
@@ -101,6 +101,15 @@
                     <description>The name of the project currently being built.</description>
                 </parameter>
                 <parameter>
+                    <name>project.artifactId</name> 
+                    <property>project.artifactId</property>
+                    <required>true</required>
+                    <readonly>true</readonly>
+                    <defaultValue>${project.artifactId}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>The artifactId of the project currently being built.</description>
+                </parameter>
+                <parameter>
                     <name>commons.componentid</name> 
                     <property>commons.componentid</property>
                     <required>true</required>
@@ -119,13 +128,31 @@
                     <description>The version of the latest release of the project.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.name</name> 
-                    <property>commons.release.name</property>
+                    <name>commons.release.desc</name> 
+                    <property>commons.release.desc</property>
                     <required>true</required>
                     <readonly>false</readonly>
-                    <defaultValue>${project.artifactId}-${commons.release.version}</defaultValue>
+                    <defaultValue>${commons.release.desc}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Release Title or Description.</description>
+                </parameter>
+                <parameter>
+                    <name>commons.release.version.2</name> 
+                    <property>commons.release.version.2</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.version.2}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>The version of an alternative release of the project.</description>
+                </parameter>
+                <parameter>
+                    <name>commons.release.desc.2</name> 
+                    <property>commons.release.desc.2</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.desc.2}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>The final name (i.e. artifactId-version) of the artifacts
being built.</description>
+                    <description>Alternative Release Title or Description.</description>
                 </parameter>
                 <parameter>
                     <name>commons.binary.suffix</name> 



Mime
View raw message