svn commit: r1884005 - in /db/derby/code/trunk: RELEASE-NOTES.html build.xml java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java

[rh...@apache.org]

Author: rhillegas
Date: Tue Dec  1 22:21:06 2020
New Revision: 1884005

URL: http://svn.apache.org/viewvc?rev=1884005&view=rev
Log:
DERBY-7093: Replace dots with underscores when the ant transformrelnotes target constructs the names of the cgi script and download page; commit derby-7093-02-aa-updateReleasePublicationTargets.diff.

Modified:
    db/derby/code/trunk/RELEASE-NOTES.html
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java

Modified: db/derby/code/trunk/RELEASE-NOTES.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/RELEASE-NOTES.html?rev=1884005&r1=1884004&r2=1884005&view=diff
==============================================================================
--- db/derby/code/trunk/RELEASE-NOTES.html (original)
+++ db/derby/code/trunk/RELEASE-NOTES.html Tue Dec  1 22:21:06 2020
@@ -137,7 +137,7 @@ in the bin directory of the release dist
 <td><a href="https://issues.apache.org/jira/browse/DERBY-7016">DERBY-7016</a></td><td>Adjust the set*CP scripts to include derbyshared.jar and to set a MODULEPATH variable as well</td>
 </tr>
 <tr>
-<td><a href="https://issues.apache.org/jira/browse/DERBY-6981">DERBY-6981</a></td><td>"SQLSTATE: XJ001, SQLERRMC: java.lang.NullPointerException&#20;&#20;XJ001.U"</td>
+<td><a href="https://issues.apache.org/jira/browse/DERBY-6981">DERBY-6981</a></td><td>"SQLSTATE: XJ001, SQLERRMC: java.lang.NullPointerException  XJ001.U"</td>
 </tr>
 <tr>
 <td><a href="https://issues.apache.org/jira/browse/DERBY-6980">DERBY-6980</a></td><td>Documentation changes to accompany jigsaw-modularization of derby</td>

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1884005&r1=1884004&r2=1884005&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Dec  1 22:21:06 2020
@@ -3847,6 +3847,17 @@ you should not have to do this.
           prompt="Enter the id of this release (e.g., 10.7.1.0) >  "
         />
 
+        <!-- Replace the dots with underscores, see https://issues.apache.org/jira/browse/DERBY-7093 -->
+        <loadresource property="derby.release.download.page.name">
+          <propertyresource name="derby.release.id"/>
+          <filterchain>
+            <tokenfilter>
+              <filetokenizer/>
+              <replacestring from="." to="_"/>
+            </tokenfilter>
+          </filterchain>
+        </loadresource>
+
     </target>
 
     <!-- Prompt for branch id if it is missing -->
@@ -4090,7 +4101,7 @@ you should not have to do this.
         />
         <transformReleaseNotes
             inputFileName="${relnotes.src}"
-            outputFileName="${relnotes.target.dir}/release-${derby.release.id}.html"
+            outputFileName="${relnotes.target.dir}/release-${derby.release.download.page.name}.html"
             cliXconfFileName="${website.root}/src/documentation/conf/cli.xconf"
             releaseId="${derby.release.id}"
         />
@@ -4098,7 +4109,7 @@ you should not have to do this.
         <!-- Copy the cgi script which enables mirroring for the new release -->
         <copy
             file="${relnotes.target.dir}/release-template.cgi"
-            tofile="${relnotes.target.dir}/release-${derby.release.id}.cgi"
+            tofile="${relnotes.target.dir}/release-${derby.release.download.page.name}.cgi"
           />
 
     </target>

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java?rev=1884005&r1=1884004&r2=1884005&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java Tue Dec  1 22:21:06 2020
@@ -492,9 +492,13 @@ public class ReleaseNotesTransformer ext
     private void wireIntoBuild()
         throws Exception
     {
+        // The release id needs to be transformed for use as a download page name.
+        // See https://issues.apache.org/jira/browse/DERBY-7093
+        String downloadPageName = _releaseID.replace(".", "_");
+        
         String contents = readFileIntoString( _cliXconfFile );
         int insertPoint = contents.indexOf( "   </uris>" );
-        String insertion = "     <uri type=\"append\" src=\"releases/release-" + _releaseID + ".html\"/>\n";
+        String insertion = "     <uri type=\"append\" src=\"releases/release-" + downloadPageName + ".html\"/>\n";
         String result = contents.substring( 0, insertPoint ) + insertion + contents.substring( insertPoint );
 
         writeStringIntoFile( result, _cliXconfFile );