db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r783062 - in /db/derby/code/branches/10.5: ./ java/build/org/apache/derbyBuild/ tools/release/
Date Tue, 09 Jun 2009 16:28:07 GMT
Author: myrnavl
Date: Tue Jun  9 16:28:07 2009
New Revision: 783062

URL: http://svn.apache.org/viewvc?rev=783062&view=rev
Log:
DERBY-3598 ; add excludeVersion functionality to ReleaseNotesGenerator.
  modified merge of revision 782867 from trunk.

Added:
    db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ElementFacade.java
      - copied unchanged from r782867, db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java
    db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/GeneratorBase.java
      - copied unchanged from r782867, db/derby/code/trunk/java/build/org/apache/derbyBuild/GeneratorBase.java
    db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/JiraIssue.java
      - copied unchanged from r782867, db/derby/code/trunk/java/build/org/apache/derbyBuild/JiraIssue.java
Modified:
    db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNoteReader.java
    db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
    db/derby/code/branches/10.5/releaseSummary.xml
    db/derby/code/branches/10.5/tools/release/build.xml

Modified: db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNoteReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNoteReader.java?rev=783062&r1=783061&r2=783062&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNoteReader.java (original)
+++ db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNoteReader.java Tue Jun  9 16:28:07 2009
@@ -22,12 +22,7 @@
 package org.apache.derbyBuild;
 
 import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
 import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
 import org.w3c.dom.*;
 
 /**
@@ -54,8 +49,6 @@
         "    where\n" +
         "                  RELEASE_NOTE_FILE is the name of the file which holds the release note\n";
 
-    private static  final   String  PARAGRAPH = "p";
-    private static  final   String  BODY = "body";
 
     /////////////////////////////////////////////////////////////////////////
     //
@@ -151,7 +144,7 @@
         // </p>
         //
         Element     root = releaseNote.getDocumentElement();
-        Element     summaryParagraph = getFirstChild( root, PARAGRAPH );
+        Element     summaryParagraph = GeneratorBase.getFirstChild( root, GeneratorBase.PARAGRAPH );
 
         return summaryParagraph;
     }
@@ -165,51 +158,13 @@
         throws Exception
     {
         Element     root = releaseNote.getDocumentElement();
-        Element     details = getFirstChild( root, BODY );
+        Element     details = GeneratorBase.getFirstChild( root, GeneratorBase.BODY );
 
         return details;
     }
 
-    ////////////////////////////////////////////////////////
-    //
-    // XML MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    private Element getFirstChild( Element node, String childName )
-        throws Exception
-    {
-        Element retval = getOptionalChild( node, childName );
-
-        if ( retval == null )
-        {
-            throw new Exception( "Could not find child element '" + childName + "' in parent element '" + node.getNodeName() + "'." );
-        }
-
-        return retval;
-    }
-
-    private Element getOptionalChild( Element node, String childName )
-        throws Exception
-    {
-        return (Element) node.getElementsByTagName( childName ).item( 0 );
-    }
 
-    /**
-     * <p>
-     * Squeeze the text out of an Element.
-     * </p>
-     */
-    private String squeezeText( Element node )
-        throws Exception
-    {
-        Node        textChild = node.getFirstChild();
-        String      text = textChild.getNodeValue();
-
-        return text;
-    }
-
-   ////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////
     //
     // MISC MINIONS
     //

Modified: db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java?rev=783062&r1=783061&r2=783062&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java (original)
+++ db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java Tue Jun  9 16:28:07 2009
@@ -22,18 +22,10 @@
 package org.apache.derbyBuild;
 
 import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
+import java.util.*;
 import org.w3c.dom.*;
-
+import java.net.URL;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
 
 /**
  * <p>
@@ -54,7 +46,8 @@
  * <li>Put your xml JIRA reports in that directory. They should have the
  * following names:
  *  <ul>
- *  <li>fixedBugsList.xml - This is the list of issues addressed by the release.</li>
+ *  <li>fixedBugsList.xml - This is the list of issues addressed
+ * by the release.</li>
  *  <li>releaseNotesList.xml - This is the list of issues which have detailed
  *  release notes.</li>
  *  </ul>
@@ -68,21 +61,14 @@
  * <p>
  * <a href="http://issues.apache.org/jira/browse/DERBY-2570">DERBY-2570</a>
  * </p>
- *
- * <p>
- * The format of the html reports changes over time. You may need to adjust this
- * tool for each release.
- * </p>
- *
  */
-public class ReleaseNotesGenerator extends Task
-{
+public class ReleaseNotesGenerator extends GeneratorBase {
     /////////////////////////////////////////////////////////////////////////
     //
     //  CONSTANTS
     //
     /////////////////////////////////////////////////////////////////////////
-    
+
     private static  final   String  USAGE =
         "Usage:\n" +
         "\n" +
@@ -100,61 +86,35 @@
         "ping issues.apache.org.\n" +
         "\n" +
         "The ReleaseNoteGenerator assumes that the two JIRA reports contain\n" +
-        "key and title information for each Derby issue. For each\n" +
+        "key, title, and attachments elements for each Derby issue. For each\n" +
         "issue in NOTES_LIST, the ReleaseNotesGenerator looks through the\n" +
-        "attachments clipped to that issue and grabs the latest reported\n" +
+        "attachments block in that report and grabs the latest reported\n" +
         "releaseNote.html.\n" +
         "\n" +
-        "In order to parse the xml files, you may need to remove the\n" +
-        "introductory DOCTYPE preamble because it refers to a DTD which does\n" +
-        "not live in your local file system.\n" +
-        "\n" +
         "For this reason, it is recommended that you freshly generate BUG_LIST\n" +
         "and NOTES_LIST just before you run this tool.\n"
         ;
 
-    // header levels
-    private static  final   int     BANNER_LEVEL = 1;
-    private static  final   int     MAIN_SECTION_LEVEL = BANNER_LEVEL + 1;
-    private static  final   int     ISSUE_DETAIL_LEVEL = MAIN_SECTION_LEVEL + 1;
-    
+
     // major sections
     private static  final   String  OVERVIEW_SECTION = "Overview";
     private static  final   String  NEW_FEATURES_SECTION = "New Features";
     private static  final   String  BUG_FIXES_SECTION = "Bug Fixes";
     private static  final   String  ISSUES_SECTION = "Issues";
-    private static  final   String  BUILD_ENVIRONMENT_SECTION = "Build Environment";
+    private static  final   String  BUILD_ENVIRONMENT_SECTION =
+            "Build Environment";
 
     // headlines
     private static  final   String  ANT_HEADLINE = "Ant";
     private static  final   String  BRANCH_HEADLINE = "Branch";
     private static  final   String  COMPILER_HEADLINE = "Compiler";
-    private static  final   String  DESCRIPTION_HEADLINE = "Description";
-    private static  final   String  ISSUE_ID_HEADLINE = "Issue Id";
     private static  final   String  JAVA6_HEADLINE = "Java 6";
     private static  final   String  JDK14_HEADLINE = "JDK 1.4";
     private static  final   String  JSR169_HEADLINE = "JSR 169";
     private static  final   String  MACHINE_HEADLINE = "Machine";
 
-    // formatting tags
-    private static  final   String  ANCHOR = "a";
-    private static  final   String  BODY = "body";
-    private static  final   String  BOLD = "b";
-    private static  final   String  BORDER = "border";
-    private static  final   String  COLUMN = "td";
-    private static  final   String  HORIZONTAL_LINE = "hr";
-    private static  final   String  HTML = "html";
-    private static  final   String  INDENT = "blockquote";
-    private static  final   String  LIST = "ul";
-    private static  final   String  LIST_ELEMENT = "li";
-    private static  final   String  NAME = "name";
-    private static  final   String  PARAGRAPH = "p";
-    private static  final   String  ROW = "tr";
-    private static  final   String  TABLE = "table";
-
     // tags in summary xml
     private static  final   String  SUM_ANT_VERSION = "antVersion";
-    private static  final   String  SUM_BRANCH = "branch";
     private static  final   String  SUM_COMPILER = "compilers";
     private static  final   String  SUM_JAVA6 = "java6";
     private static  final   String  SUM_JDK14 = "jdk1.4";
@@ -162,357 +122,122 @@
     private static  final   String  SUM_MACHINE = "machine";
     private static  final   String  SUM_NEW_FEATURES = "newFeatures";
     private static  final   String  SUM_OVERVIEW = "overview";
-    private static  final   String  SUM_PREVIOUS_RELEASE_ID = "previousReleaseID";
-    private static  final   String  SUM_RELEASE_ID = "releaseID";
 
-    // tags in JIRA reports
-    private static  final   String  JIRA_ITEM = "h3";
-
-    // positioning strings inside a JIRA
-    private static  final   String  ATTACHMENT_START = "/jira/secure/attachment/";
-    private static  final   String  ATTACHMENT_VERSION_END = "/";
-    private static  final   String  ATTACHMENT_END = "\"";
-    private static  final   String  ATTACHMENT_PREFIX = "https://issues.apache.org";
-
-    // managing releaseNote.html
-    private static  final   String  RN_SUMMARY_OF_CHANGE = "Summary of Change";
-
-    // other JIRA control
-    private static  final   String  RELEASE_NOTE_NAME = "releaseNote.html";
-    private static  final   String  RN_H4 = "h4";
-    
-    // other html control
-    private static  final   int     DEFAULT_TABLE_BORDER_WIDTH = 2;
-    private static  final   String  XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-    
     /////////////////////////////////////////////////////////////////////////
     //
     //  STATE
     //
     /////////////////////////////////////////////////////////////////////////
 
+    private ReleaseNoteReader releaseNoteReader = new ReleaseNoteReader(docBldr);
     // set on the command line or by ant
-    private String  _summaryFileName;
-    private String  _bugListFileName;
-    private String  _releaseNotesListFileName;
-    private String  _pamphletFileName;
-
-    // computed at run time
-    private String  _releaseID;
-    private String  _previousReleaseID;
-
-    // misc
-    private boolean _invokedByAnt = true;
-    
-    /////////////////////////////////////////////////////////////////////////
-    //
-    //  INNER CLASSES
-    //
-    /////////////////////////////////////////////////////////////////////////
-
-    /**
-     * <p>
-     * State used by the generator
-     * </p>
-     */
-    public  static  class   GeneratorState
-    {
-        private DocumentBuilder _documentBuilder;
-        private Document    _pamphlet;
-        private Document    _summary;
-        private Document    _bugList;
-        private Document    _releaseNotesList;
-        private ReleaseNoteReader   _releaseNoteReader;
-
-        private ArrayList       _missingReleaseNotes;
-        private ArrayList       _errors;
-
-        public  GeneratorState
-            (
-             DocumentBuilder    documentBuilder,
-             Document   pamphlet,
-             Document   summary,
-             Document   bugList,
-             Document   releaseNotesList
-             )
-        {
-            _documentBuilder = documentBuilder;
-            _pamphlet = pamphlet;
-            _summary = summary;
-            _bugList = bugList;
-            _releaseNotesList = releaseNotesList;
-
-            _missingReleaseNotes = new ArrayList();
-            _errors = new ArrayList();
-
-            _releaseNoteReader = new ReleaseNoteReader( documentBuilder );
-        }
-
-        public  void    addMissingReleaseNote( JiraIssue issue )
-        {
-            _missingReleaseNotes.add( issue );
-        }
-
-        public  void    addError( String message )
-        {
-            _errors.add( message );
-        }
+    private String releaseNotesListFileName;
+    private Document releaseNotesDoc;
+    private ArrayList missingReleaseNotes = new ArrayList();
 
-        public  DocumentBuilder getDocumentBuilder() { return _documentBuilder; }
-        public  Document    getPamphlet() { return _pamphlet; }
-        public  Document    getSummary() { return _summary; }
-        public  Document    getBugList() { return _bugList; }
-        public  Document    getReleaseNotesList() { return _releaseNotesList; }
-        public  ReleaseNoteReader   getReleaseNoteReader() { return _releaseNoteReader; }
-        
-        public  JiraIssue[]     getMissingReleaseNotes()
-        {
-            JiraIssue[]     missingNotes = new JiraIssue[ _missingReleaseNotes.size() ];
 
-            _missingReleaseNotes.toArray( missingNotes );
-
-            return missingNotes;
-        }
-
-        public  String[]     getErrors()
-        {
-            String[]        squeezed = new String[ _errors.size() ];
-
-            _errors.toArray( squeezed );
-
-            return squeezed;
-        }
-    }
-
-    /**
-     * <p>
-     * An issue from a JIRA report.
-     * </p>
-     */
-    public  static  class   JiraIssue
-    {
-        private String  _key;
-        private String  _title;
-
-        public  JiraIssue
-            (
-             String key,
-             String title
-             )
-        {
-            _key = key;
-            _title = title;
-        }
-
-        public  String  getKey() { return _key; }
-        public  String  getTitle() { return _title; }
-        
-        public  String  getJiraAddress()
-        {
-            return "http://issues.apache.org/jira/browse/" + _key;
-        }
+    public ReleaseNotesGenerator() throws Exception {
     }
-    
-    /////////////////////////////////////////////////////////////////////////
-    //
-    //  CONSTRUCTORS
-    //
-    /////////////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////////////
-    //
-    //  ENTRY POINT
-    //
-    /////////////////////////////////////////////////////////////////////////
 
     /**
-     * <p>
      * Generate the release notes (for details on how to invoke this tool, see
      * the header comment on this class).
-     * </p>
+     * @param args command line arguments
+     * @throws Exception
      */
-    public  static  void    main( String[] args )
-        throws Exception
-    {
+    public static void main(String[] args) throws Exception {
         ReleaseNotesGenerator   me = new ReleaseNotesGenerator();
 
         me._invokedByAnt = false;
-        
-        if ( me.parseArgs( args ) ) { me.execute(); }
-        else { me.printUsage(); }
+
+        if (me.parseArgs(args)) { me.execute(); }
+        else { me.println(USAGE); }
     }
-    
+
     /////////////////////////////////////////////////////////////////////////
     //
     //  ANT Task BEHAVIOR
     //
     /////////////////////////////////////////////////////////////////////////
 
-    /** Ant accessor to set the name of the summary file prepared by the Release Manager */
-    public   void    setSummaryFileName( String summaryFileName ) { _summaryFileName = summaryFileName; }     
-
-    /** Ant accessor to set the name of the JIRA-generated list of bugs addressed by this release */
-    public   void    setBugListFileName( String bugListFileName ) { _bugListFileName = bugListFileName; }     
+    /**
+     * Ant accessor to set the name of the JIRA-generated list of bugs which
+     * have release notes
+     * @param releaseNotesListFileName name of the xml file from the release
+     * note Jira filter/query
+     * @throws Exception
+     */
+    public void setReleaseNotesListFileName(String releaseNotesListFileName)
+            throws Exception {
+        this.releaseNotesListFileName = releaseNotesListFileName;
+        releaseNotesDoc = docBldr.parse(new File(releaseNotesListFileName));
+    }
 
-    /** Ant accessor to set the name of the JIRA-generated list of bugs which have release notes */
-    public   void    setReleaseNotesListFileName( String releaseNotesListFileName ) { _releaseNotesListFileName = releaseNotesListFileName; }     
 
-    /** Ant accessor to set the name of the generated output file */
-    public   void    setPamphletFileName( String pamphletFileName ) { _pamphletFileName = pamphletFileName; }     
-        
     /**
-     * <p>
      * This is Ant's entry point into this task.
-     * </p>
+     * @throws BuildException
      */
-    public  void    execute()
-        throws BuildException
-    {
+    public void execute() throws BuildException {
         try {
-            GeneratorState                  gs = initialize();
-
-            beginPamphlet( gs );
-            buildOverview( gs );
-            buildNewFeatures( gs );
-            buildBugList( gs );
-            buildIssuesList( gs );
-            buildEnvironment( gs );
-            replaceVariables( gs );
-            endPamphlet( gs );
-            
-            printPamphlet( gs );
+            beginOutput();
+            buildOverview();
+            buildNewFeatures();
+            buildFixedBugsList();
+            buildReleaseNoteIssuesList();
+            buildEnvironment();
+            replaceVariables();
+            printOutput();
 
-            printMissingReleaseNotes( gs );
-            printErrors( gs );
+            printMissingReleaseNotes();
+            printErrors();
         }
-        catch ( Throwable t )
-        {
+        catch (Throwable t) {
             t.printStackTrace();
-            
-            throw new BuildException( "Error running ReleaseNotesGenerator: " + t.getMessage(), t );
-        }
-    }
-    
-    /////////////////////////////////////////////////////////////////////////
-    //
-    //  OTHER ACCESSORS
-    //
-    /////////////////////////////////////////////////////////////////////////
 
-    /**
-     * <p>
-     * Get the release ID from the summary file.
-     * </p>
-     */
-    private String getReleaseID( GeneratorState gs)
-        throws Exception
-    {
-        if ( _releaseID == null )
-        {
-            Document    summary = gs.getSummary();
-            Element     summaryRoot = summary.getDocumentElement();
-            
-            _releaseID = squeezeText( getFirstChild( summaryRoot, SUM_RELEASE_ID ) );
+            throw new BuildException("Error running ReleaseNotesGenerator: " +
+                    t.getMessage(), t);
         }
-        
-        return _releaseID;
     }
-    
-    /**
-     * <p>
-     * Get the previous release ID from the summary file.
-     * </p>
-     */
-    private String getPreviousReleaseID( GeneratorState gs)
-        throws Exception
-    {
-        if ( _previousReleaseID == null )
-        {
-            Document    summary = gs.getSummary();
-            Element     summaryRoot = summary.getDocumentElement();
-            
-            _previousReleaseID = squeezeText( getFirstChild( summaryRoot, SUM_PREVIOUS_RELEASE_ID ) );
-        }
-        
-        return _previousReleaseID;
-    }
-    
+
+
     /////////////////////////////////////////////////////////////////////////
     //
     //  MINIONS
     //
     /////////////////////////////////////////////////////////////////////////
 
-    //////////////////////////////////
-    //
-    //  Boilerplate
-    //
-    //////////////////////////////////
-
     /**
-     * <p>
-     * Start an html docment. Returns the body element.
-     * </p>
+     * Start the RELEASE_NOTES html docment.
      */
-    private void beginPamphlet( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        String          releaseID = getReleaseID( gs );
-        String          titleText = "Release Notes for Derby " + releaseID;
-        Element     html = pamphlet.createElement( HTML );
-        Element     title = createTextElement( pamphlet, "title", titleText );
-        Element     body = pamphlet.createElement( BODY );
-
-        pamphlet.appendChild( html );
-        html.appendChild( title );
-        html.appendChild( body );
-        
-        Element     bannerBlock = createHeader( body, BANNER_LEVEL, titleText );
-        buildDelta( gs, bannerBlock );
-        
-        Element     toc = createList( body );
-
-        createSection( body, MAIN_SECTION_LEVEL, toc, OVERVIEW_SECTION, OVERVIEW_SECTION );
-        createSection( body, MAIN_SECTION_LEVEL, toc, NEW_FEATURES_SECTION, NEW_FEATURES_SECTION );
-        createSection( body, MAIN_SECTION_LEVEL, toc, BUG_FIXES_SECTION, BUG_FIXES_SECTION );
-        createSection( body, MAIN_SECTION_LEVEL, toc, ISSUES_SECTION, ISSUES_SECTION );
-        createSection( body, MAIN_SECTION_LEVEL, toc, BUILD_ENVIRONMENT_SECTION, BUILD_ENVIRONMENT_SECTION );
+    private void beginOutput() throws Exception {
+        String titleText = "Release Notes for Derby " + releaseID;
+        Element html = outputDoc.createElement(HTML);
+        Element title = createTextElement(outputDoc, "title", titleText);
+        Element body = outputDoc.createElement(BODY);
+
+        outputDoc.appendChild(html);
+        html.appendChild(title);
+        html.appendChild(body);
+
+        Element bannerBlock = createHeader(body, BANNER_LEVEL, titleText);
+        buildDelta(bannerBlock);
+
+        Element toc = createList(body);
+
+        createSection(body, MAIN_SECTION_LEVEL, toc,
+                OVERVIEW_SECTION, OVERVIEW_SECTION);
+        createSection(body, MAIN_SECTION_LEVEL, toc,
+                NEW_FEATURES_SECTION, NEW_FEATURES_SECTION);
+        createSection(body, MAIN_SECTION_LEVEL, toc,
+                BUG_FIXES_SECTION, BUG_FIXES_SECTION);
+        createSection(body, MAIN_SECTION_LEVEL, toc,
+                ISSUES_SECTION, ISSUES_SECTION);
+        createSection(body, MAIN_SECTION_LEVEL, toc,
+                BUILD_ENVIRONMENT_SECTION, BUILD_ENVIRONMENT_SECTION);
     }
-    
-    /**
-     * <p>
-     * Finish the html document.
-     * </p>
-     */
-    private void    endPamphlet( GeneratorState gs )
-        throws Exception
-    {
-    }
-    
-    //////////////////////////////////
-    //
-    //  Delta SECTION
-    //
-    //////////////////////////////////
 
-    /**
-     * <p>
-     * Note that this release is a delta from the previous one.
-     * </p>
-     */
-    private void buildDelta( GeneratorState gs, Element parent )
-        throws Exception
-    {
-        String          releaseID = getReleaseID( gs );
-        String          previousReleaseID = getPreviousReleaseID( gs );
-        String          deltaStatement =
-            "These notes describe the difference between Derby release " + releaseID +
-            " and the preceding release " + previousReleaseID + ".";
 
-        addParagraph( parent, deltaStatement );
-    }
-    
     //////////////////////////////////
     //
     //  Overview SECTION
@@ -520,23 +245,14 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Build the Overview section.
-     * </p>
      */
-    private void buildOverview( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        Element     overviewSection = getSection( pamphlet, MAIN_SECTION_LEVEL, OVERVIEW_SECTION );
-        Document    summary = gs.getSummary();
-        Element     summaryRoot = summary.getDocumentElement();
-        Element     details = getFirstChild( summaryRoot, SUM_OVERVIEW );
-
+    private void buildOverview() throws Exception {
         // copy the details out of the summary file into the overview section
-        cloneChildren( details, overviewSection );
+        cloneChildren(summary.getElementByTagName(SUM_OVERVIEW),
+                getSection(outputDoc, MAIN_SECTION_LEVEL, OVERVIEW_SECTION));
     }
-    
+
     //////////////////////////////////
     //
     //  New Features SECTION
@@ -544,23 +260,15 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Build the New Features section.
-     * </p>
      */
-    private void buildNewFeatures( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        Element     newFeaturesSection = getSection( pamphlet, MAIN_SECTION_LEVEL, NEW_FEATURES_SECTION );
-        Document    summary = gs.getSummary();
-        Element     summaryRoot = summary.getDocumentElement();
-        Element     details = getFirstChild( summaryRoot, SUM_NEW_FEATURES );
-
+    private void buildNewFeatures() throws Exception {
         // copy the details out of the summary file into the overview section
-        cloneChildren( details, newFeaturesSection );
+        cloneChildren(summary.getElementByTagName(SUM_NEW_FEATURES),
+                getSection(outputDoc, MAIN_SECTION_LEVEL,
+                NEW_FEATURES_SECTION));
     }
-    
+
     //////////////////////////////////
     //
     //  Bug List SECTION
@@ -568,43 +276,42 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Build the Bug List section.
-     * </p>
+     * @param gs state
      */
-    private void buildBugList( GeneratorState gs )
+    private void buildFixedBugsList()
         throws Exception
     {
-        Document    pamphlet = gs.getPamphlet();
-        Element     bugListSection = getSection( pamphlet, MAIN_SECTION_LEVEL, BUG_FIXES_SECTION );
-        Document    bugList = gs.getBugList();
-        JiraIssue[]    bugs = getJiraIssues( bugList );
-        int                 count = bugs.length;
-        String          releaseID = getReleaseID( gs );
-        String          previousReleaseID = getPreviousReleaseID( gs );
-        String          deltaStatement =
-            "The following issues are addressed by Derby release " + releaseID +
-            ". These issues are not addressed in the preceding " + previousReleaseID + " release.";
+        Element bugListSection = getSection(outputDoc, MAIN_SECTION_LEVEL,
+                BUG_FIXES_SECTION );
 
-        addParagraph( bugListSection, deltaStatement );
+        String deltaStatement =
+            "The following issues are addressed by Derby release " + releaseID +
+            ". These issues are not addressed in the preceding " +
+            previousReleaseID + " release.";
 
-        Element     table = createTable
-            ( bugListSection, DEFAULT_TABLE_BORDER_WIDTH, new String[] { ISSUE_ID_HEADLINE, DESCRIPTION_HEADLINE } );
+        addParagraph(bugListSection, deltaStatement);
 
-        for ( int i = 0; i < count; i++ )
-        {
-            JiraIssue   issue = bugs[ i ];
-            Element     row = insertRow( table );
-            Element     linkColumn = insertColumn( row );
-            Element     descriptionColumn = insertColumn( row );
-            Element     hotlink = createLink( pamphlet, issue.getJiraAddress(), issue.getKey() );
-            Text            title = pamphlet.createTextNode( issue.getTitle() );
+        Element table = createTable
+            (bugListSection, DEFAULT_TABLE_BORDER_WIDTH,
+            new String[] { ISSUE_ID_HEADLINE, DESCRIPTION_HEADLINE });
+
+        for (Iterator i = JiraIssue.createJiraIssueList(bugListDoc,
+                excludeReleaseIDList).iterator(); i.hasNext();) {
+            JiraIssue issue = (JiraIssue) i.next();
+            println("Fixed: "+ issue.getKey());
+            Element row = insertRow(table);
+            Element linkColumn = insertColumn(row);
+            Element descriptionColumn = insertColumn(row);
+            Element hotlink = createLink(outputDoc, issue.getJiraAddress(),
+                    issue.getKey());
+            Text title = outputDoc.createTextNode(issue.getTitle());
 
-            linkColumn.appendChild( hotlink );
-            descriptionColumn.appendChild( title );
+            linkColumn.appendChild(hotlink);
+            descriptionColumn.appendChild(title);
         }
     }
-    
+
     //////////////////////////////////
     //
     //  Issues SECTION
@@ -612,206 +319,53 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Build the Issues section.
-     * </p>
      */
-    private void buildIssuesList( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        Element     issuesSection = getSection( pamphlet, MAIN_SECTION_LEVEL, ISSUES_SECTION );
-        Document    issuesList = gs.getReleaseNotesList();
-        ReleaseNoteReader   releaseNoteReader = gs.getReleaseNoteReader();
-        JiraIssue[]    bugs = getJiraIssues( issuesList );
-        int                 count = bugs.length;
-        String          releaseID = getReleaseID( gs );
-        String          previousReleaseID = getPreviousReleaseID( gs );
-        String          deltaStatement =
+    private void buildReleaseNoteIssuesList()
+        throws Exception {
+        Element issuesSection = getSection(outputDoc, MAIN_SECTION_LEVEL,
+                ISSUES_SECTION);
+        String deltaStatement =
             "Compared with the previous release (" + previousReleaseID +
             "), Derby release " + releaseID + " introduces the following " +
-            "incompatibilities. These merit your special attention.";
-        
-        addParagraph( issuesSection, deltaStatement );
-
-        Element     toc = createList( issuesSection );
-
-        for ( int i = 0; i < count; i++ )
-        {
-            JiraIssue       issue = bugs[ i ];
-            
-            Document    releaseNote = null;
+            "new features " +
+            "and incompatibilities. These merit your special attention.";
 
-            try {
-                releaseNote = getReleaseNote( gs, issue );
-            }
-            catch (Throwable t)
-            {
-                gs.addError( formatError( "Unable to read or parse release note for " + issue.getKey(), t ) );
-            }
-
-            // skip this note if we were unable to read it
-            if ( releaseNote == null )
-            {
-                gs.addMissingReleaseNote( issue );
-                continue;
-            }
-            
-            String          key = "Note for " + issue.getKey();
-            Node     summaryText = null;
+        addParagraph(issuesSection, deltaStatement);
+        Element toc = createList(issuesSection);
 
-            try {
-                summaryText = releaseNoteReader.getReleaseNoteSummary( releaseNote );
+        for (Iterator i = JiraIssue.createJiraIssueList(releaseNotesDoc,
+                excludeReleaseIDList).iterator(); i.hasNext();) {
+            JiraIssue issue = (JiraIssue) i.next();
+            if (issue.hasReleaseNote()) {
+                Node summaryText = null;
+                Element details = null;
+                try {
+                    URL url = new URL(issue.getReleaseNoteAddress());
+                    InputStream is = url.openStream();
+                    Document releaseNote = releaseNoteReader.getReleaseNote(is);
+                    summaryText = releaseNoteReader.
+                            getReleaseNoteSummary(releaseNote);
+                    details = releaseNoteReader.
+                            getReleaseNoteDetails(releaseNote);
+                } catch (Throwable t) {
+                    errors.add(formatError("Unable to read or parse " +
+                            "release note for " +
+                            issue.getKey(), t));
+                    missingReleaseNotes.add(issue);
+                    continue;
+                }
+
+                String key = "Note for " + issue.getKey();
+                println("Release note: "+issue.getKey()+" - "+issue.getTitle());
+                Element paragraph = outputDoc.createElement(PARAGRAPH);
+                paragraph.appendChild(outputDoc.createTextNode(key + ": "));
+                cloneChildren(summaryText, paragraph);
+                insertLine(issuesSection);
+                Element issueSection = createSection(issuesSection,
+                        ISSUE_DETAIL_LEVEL, toc, key, paragraph);
+                cloneChildren(details, issueSection);
             }
-            catch (Throwable t)
-            {
-                gs.addError( formatError( "Badly formatted summary for " + issue.getKey(), t ) );
-                summaryText = pamphlet.createTextNode( "Unreadable summary line" );
-            }
-            
-            Element         paragraph = pamphlet.createElement( PARAGRAPH );
-
-            paragraph.appendChild(  pamphlet.createTextNode( key + ": ") );
-            cloneChildren( summaryText, paragraph );
-
-            insertLine( issuesSection );
-            
-            Element     issueSection = createSection( issuesSection, ISSUE_DETAIL_LEVEL, toc, key, paragraph );
-
-            try {
-                Element     details = releaseNoteReader.getReleaseNoteDetails( releaseNote );
-
-                // copy the details out of the release note into this section of the
-                // pamphlet
-                cloneChildren( details, issueSection );
-            }
-            catch (Throwable t)
-            {
-                gs.addError( formatError( "Could not read required sections out of issue " + issue.getKey(), t ) );
-            }
-
-        }
-    }
-    
-    /**
-     * <p>
-     * Get the release note for an issue.
-     * </p>
-     */
-    private Document   getReleaseNote( GeneratorState gs, JiraIssue issue )
-        throws Exception
-    {
-        // first get the issue
-        InputStream issueStream = grabDocument( gs, issue.getJiraAddress() );
-        if ( issueStream == null ) { return null; }
-        
-        String          issueDocument = readJira( issueStream );
-        String          releaseNoteAddress = getReleaseNoteAddress( issueDocument );
-        InputStream releaseNoteStream = grabDocument( gs, releaseNoteAddress );
-        if ( releaseNoteStream == null ) { return null; }
-            
-        Document        releaseNoteDoc = gs.getReleaseNoteReader().getReleaseNote( releaseNoteStream );
-
-        return releaseNoteDoc;
-    }
-
-    /**
-     * <p>
-     * We don't even bother trying to parse an individual jira since it is html
-     * and not likely to be syntactically correct xml. We just siphon the jira
-     * into a big string.
-     * </p>
-     */
-    private String  readJira( InputStream is )
-        throws Exception
-    {
-        InputStreamReader   isr = new InputStreamReader( is, "UTF-8" );
-        LineNumberReader    lr = new LineNumberReader( isr );
-        StringBuffer            buffer = new StringBuffer();
-
-        while( true )
-        {
-            String  nextLine = lr.readLine();
-
-            if ( nextLine == null ) { break; }
-            else { buffer.append( nextLine ); }
-        }
-
-        lr.close();
-        isr.close();
-        is.close();
-
-        String  result = buffer.toString();
-
-        return result;
-    }
-    
-    /**
-     * <p>
-     * Loop through the attachment pointers in a JIRA, looking for the highest
-     * numbered release note.
-     * </p>
-     */
-    private String  getReleaseNoteAddress( String jira )
-        throws Exception
-    {
-        long    highestReleaseNoteVersion = 0;
-        String  releaseNoteAddress = null;
-        int         idx = 0;
-
-        while ( true )
-        {
-            int start = jira.indexOf( ATTACHMENT_START, idx );
-            if ( start < 0 ) { break; }
-            int end = jira.indexOf( ATTACHMENT_END, start );
-            if ( end < 0 ) { break; }
-
-            idx = end;
-
-            String  attachmentAddress = jira.substring( start, end );
-
-            // skip attachments that aren't release notes
-            if ( !attachmentAddress.endsWith( RELEASE_NOTE_NAME ) ) { continue; }
-
-            int         versionNumberStart = ATTACHMENT_START.length();
-            int         versionNumberEnd = attachmentAddress.indexOf( ATTACHMENT_VERSION_END, versionNumberStart );
-            String  versionString = attachmentAddress.substring( versionNumberStart, versionNumberEnd );
-            long    versionNumber = Long.parseLong( versionString);
-
-            if ( versionNumber >= highestReleaseNoteVersion)
-            {
-                highestReleaseNoteVersion = versionNumber;
-                releaseNoteAddress = ATTACHMENT_PREFIX + attachmentAddress;
-            }
-        }
-
-        System.out.println( "Found release note address: " + releaseNoteAddress );
-
-        return releaseNoteAddress;
-    }
-    
-    /**
-     * <p>
-     * Grab a document off the web.
-     * </p>
-     */
-    private InputStream   grabDocument( GeneratorState gs, String urlString )
-        throws Exception
-    {
-        // first get the issue
-        URL             url = null;
-        InputStream is = null;
-            
-        try {
-            url = new URL( urlString );
-            is = url.openStream();
-
-            return is;
-        }
-        catch (Throwable t)
-        {
-            processThrowable( t );
-            return null;
         }
     }
 
@@ -822,89 +376,42 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Build the section describing the build environment.
-     * </p>
      */
-    private void buildEnvironment( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        Element         environmentSection = getSection( pamphlet, MAIN_SECTION_LEVEL, BUILD_ENVIRONMENT_SECTION );
-        Document    summary = gs.getSummary();
-        Element     summaryRoot = summary.getDocumentElement();
-        String          releaseID = getReleaseID( gs );
-        String          desc = "Derby release " + releaseID + " was built using the following environment:";
+    private void buildEnvironment()
+        throws Exception {
+        Element environmentSection = getSection(outputDoc, MAIN_SECTION_LEVEL,
+                BUILD_ENVIRONMENT_SECTION );
 
-        addParagraph( environmentSection, desc );
+        String desc = "Derby release " + releaseID +
+                " was built using the following environment:";
 
-        Element     list = createList( environmentSection );
-        String          branchName = squeezeText( getFirstChild( summaryRoot, SUM_BRANCH ) );
-        String          branchText = "Source code came from the " + branchName + " branch.";
-        addHeadlinedItem( list, BRANCH_HEADLINE, branchText );
+        addParagraph(environmentSection, desc);
+        Element list = createList(environmentSection);
 
-        String          machine = squeezeText( getFirstChild( summaryRoot, SUM_MACHINE ) );
-        addHeadlinedItem( list, MACHINE_HEADLINE, machine );
+        addHeadlinedItem(list, BRANCH_HEADLINE,
+                "Source code came from the " + branch + " branch.");
 
-        String          antVersion = squeezeText( getFirstChild( summaryRoot, SUM_ANT_VERSION ) );
-        addHeadlinedItem( list, ANT_HEADLINE, antVersion );
+        addHeadlinedItem(list, MACHINE_HEADLINE,
+                summary.getTextByTagName(SUM_MACHINE));
 
-        String          jdk14Version = squeezeText( getFirstChild( summaryRoot, SUM_JDK14 ) );
-        addHeadlinedItem( list, JDK14_HEADLINE, jdk14Version );
+        addHeadlinedItem(list, ANT_HEADLINE,
+                summary.getTextByTagName(SUM_ANT_VERSION));
 
-        String          java6Version = squeezeText( getFirstChild( summaryRoot, SUM_JAVA6 ) );
-        addHeadlinedItem( list, JAVA6_HEADLINE, java6Version );
+        addHeadlinedItem(list, JDK14_HEADLINE,
+                summary.getTextByTagName(SUM_JDK14));
 
-        String          compilerText = squeezeText( getFirstChild( summaryRoot, SUM_COMPILER ) );
-        addHeadlinedItem( list, COMPILER_HEADLINE, compilerText );
+        addHeadlinedItem(list, JAVA6_HEADLINE,
+                summary.getTextByTagName(SUM_JAVA6));
 
-        String          jsr169Text = squeezeText( getFirstChild( summaryRoot, SUM_JSR169 ) );
-        addHeadlinedItem( list, JSR169_HEADLINE, jsr169Text );
-    }
-    
-    //////////////////////////////////
-    //
-    //  REPLACE VARIABLES
-    //
-    //////////////////////////////////
+        addHeadlinedItem(list, COMPILER_HEADLINE,
+                summary.getTextByTagName(SUM_COMPILER));
 
-    /**
-     * <p>
-     * Replace the known parameters with their corresponding text values.
-     * </p>
-     */
-    private void replaceVariables( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-
-        replaceTag( pamphlet, SUM_RELEASE_ID, getReleaseID( gs ) );
-        replaceTag( pamphlet, SUM_PREVIOUS_RELEASE_ID, getPreviousReleaseID( gs ) );
+        addHeadlinedItem(list, JSR169_HEADLINE,
+                summary.getTextByTagName(SUM_JSR169));
     }
-    
-   //////////////////////////////////
-    //
-    //  Print the generated document.
-    //
-    //////////////////////////////////
 
-    /**
-     * <p>
-     * Print pamphlet to output file.
-     * </p>
-     */
-    private void    printPamphlet( GeneratorState gs )
-        throws Exception
-    {
-        Document    pamphlet = gs.getPamphlet();
-        Source            source = new DOMSource( pamphlet );
-        File                  outputFile = new File( _pamphletFileName );
-        Result            result = new StreamResult( outputFile );
-        Transformer   transformer = TransformerFactory.newInstance().newTransformer();
-        
-        transformer.transform( source, result );        
-    }
-    
+
     //////////////////////////////////
     //
     //  Print errors
@@ -912,53 +419,22 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Print missing release notes
-     * </p>
      */
-    private void printMissingReleaseNotes( GeneratorState gs )
-        throws Exception
-    {
-        JiraIssue[]     missingReleaseNotes = gs.getMissingReleaseNotes();
-        int                 count = missingReleaseNotes.length;
-
-        if ( count > 0 )
-        {
-            println( "The following JIRA issues still need release notes or the release notes provided are unreadable:" );
-
-            for ( int i = 0; i < count; i++ )
-            {
-                JiraIssue   issue = missingReleaseNotes[ i ];
-                
-                println( "\t" + issue.getKey() + "\t" + issue.getTitle() );
-            }
+    private void printMissingReleaseNotes() throws Exception {
+        if (missingReleaseNotes.isEmpty()) {
+            return;
+        }
+        println("The following JIRA issues still need release notes or the " +
+                "release notes provided are unreadable:");
+
+        for (Iterator i = missingReleaseNotes.iterator(); i.hasNext();) {
+            JiraIssue issue = (JiraIssue) i.next();
+            println("\t" + issue.getKey() + "\t" + issue.getTitle());
         }
     }
-    
-    /**
-     * <p>
-     * Print errors.
-     * </p>
-     */
-    private void printErrors( GeneratorState gs )
-        throws Exception
-    {
-        String[]     errors = gs.getErrors();
-        int                 count = errors.length;
 
-        if ( count > 0 )
-        {
-            println( "The following other errors occurred:" );
-
-            for ( int i = 0; i < count; i++ )
-            {
-                String  error = errors[ i ];
-                
-                println( "\n" + error );
-            }
-        }
-    }
-    
+
     //////////////////////////////////
     //
     //  ARGUMENT MINIONS
@@ -966,9 +442,7 @@
     //////////////////////////////////
 
     /**
-     * <p>
      * Returns true if arguments parse successfully, false otherwise.
-     * </p>
      */
     private boolean    parseArgs( String[] args )
         throws Exception
@@ -980,601 +454,8 @@
         setSummaryFileName( args[ idx++ ] );
         setBugListFileName( args[ idx++ ] );
         setReleaseNotesListFileName( args[ idx++ ] );
-        setPamphletFileName( args[ idx++ ] );
+        setOutputFileName( args[ idx++ ] );
 
         return true;
     }
-    
-    private void    printUsage()
-    {
-        println( USAGE );
-    }
-
-    /**
-     * <p>
-     * Make sure that the input files all exist. Returns a state variable for the generator.
-     * </p>
-     */
-    private GeneratorState  initialize()
-        throws Exception
-    {
-        DocumentBuilderFactory  factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder              builder = factory.newDocumentBuilder();
-        Document                          pamphlet = builder.newDocument();
-        File                                    summaryFile = new File( _summaryFileName );
-        File                                    bugListFile = new File( _bugListFileName );
-        File                                    releaseNotesListFile = new File( _releaseNotesListFileName);
-        Document                        summary = builder.parse( summaryFile );
-        Document                        bugList = builder.parse( bugListFile );
-        Document                        releaseNotesList = builder.parse( releaseNotesListFile );
-        
-        return new GeneratorState
-            (
-             builder,
-             pamphlet,
-             summary,
-             bugList,
-             releaseNotesList
-             );
-    }
-
-    ////////////////////////////////////////////////////////
-    //
-    // HTML MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    /**
-     * <p>
-     * Create a section at the end of a parent element and link to it from a
-     * table of contents.
-     * </p>
-     */
-    private Element createSection( Element parent, int sectionLevel, Element toc, String sectionName, String tocEntry )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Text                textNode = doc.createTextNode( tocEntry );
-
-        return createSection( parent, sectionLevel, toc, sectionName, textNode );
-    }
-    
-    /**
-     * <p>
-     * Create a section at the end of a parent element and link to it from a
-     * table of contents.
-     * </p>
-     */
-    private Element createSection( Element parent, int sectionLevel, Element toc, String sectionName, Node visibleText )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Element             link = createLocalLink( doc, sectionName, visibleText );
-
-        addListItem( toc, link );
-
-        return createHeader( parent, sectionLevel, sectionName );
-    }
-    
-    /**
-     * <p>
-     * Create a header at the end of the parent node. Return the block created
-     * to hold the text following this header.
-     * </p>
-     */
-    private Element createHeader( Element parent, int headerLevel, String text )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Text            textNode = doc.createTextNode( text );
-        Element         header = doc.createElement( makeHeaderTag( headerLevel ) );
-        Element         anchor = doc.createElement( ANCHOR );
-        Element         block =doc.createElement( INDENT );
-
-        parent.appendChild( header );
-        anchor.setAttribute( NAME, text );
-        header.appendChild( anchor );
-        header.appendChild( textNode );
-        parent.appendChild( block );
-        
-        return block;
-    }
-    
-    /**
-     * <p>
-     * Create an html text element.
-     * </p>
-     */
-    private Element createTextElement( Document doc, String tag, String text )
-        throws Exception
-    {
-        Element     retval = doc.createElement( tag );
-        Text            textNode = doc.createTextNode( text );
-
-        retval.appendChild( textNode );
-        
-        return retval;
-    }
-
-    /**
-     * <p>
-     * Create a standard link to a local label.
-     * </p>
-     */
-    private Element createLocalLink( Document doc, String anchor, String text )
-        throws Exception
-    {
-        Text        textNode = doc.createTextNode( text );
-
-        return createLocalLink( doc, anchor, textNode );
-    }
-    
-    /**
-     * <p>
-     * Create a standard link to a local label.
-     * </p>
-     */
-    private Element createLocalLink( Document doc, String anchor, Node visibleText )
-        throws Exception
-    {
-        return createLink( doc, "#" + anchor, visibleText );
-    }
-    
-    /**
-     * <p>
-     * Create a hotlink.
-     * </p>
-     */
-    private Element createLink( Document doc, String label, String text )
-        throws Exception
-    {
-        Text        textNode = doc.createTextNode( text );
-
-        return createLink( doc, label, textNode );
-    }
-    
-    /**
-     * <p>
-     * Create a hotlink.
-     * </p>
-     */
-    private Element createLink( Document doc, String label, Node visibleText )
-        throws Exception
-    {
-        Element hotlink = doc.createElement( ANCHOR );
-
-        hotlink.setAttribute( "href", label );
-        hotlink.appendChild( visibleText );
-
-        return hotlink;
-    }
-    
-    /**
-     * <p>
-     * Insert a list at the end of the parent element.
-     * </p>
-     */
-    private Element createList( Element parent )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Element list = doc.createElement( LIST );
-
-        parent.appendChild( list );
-
-        return list;
-    }
-    
-    /**
-     * <p>
-     * Add an item with a bold name to the end of a list.
-     * </p>
-     */
-    private Element addHeadlinedItem( Element list, String headline, String text )
-        throws Exception
-    {
-        Document        doc = list.getOwnerDocument();
-        Element         itemElement = doc.createElement( LIST_ELEMENT );
-        Element         boldText = boldText( doc, headline );
-        Text            textNode = doc.createTextNode( " - " + text );
-
-        list.appendChild( itemElement );
-        itemElement.appendChild( boldText );
-        itemElement.appendChild( textNode );
-
-        return itemElement;
-    }
-    
-    /**
-     * <p>
-     * Make some bold text.
-     * </p>
-     */
-    private Element boldText( Document doc, String text)
-        throws Exception
-    {
-        Element bold = createTextElement( doc, BOLD, text );
-
-        return bold;
-    }
-    
-    /**
-     * <p>
-     * Add an item to the end of a list.
-     * </p>
-     */
-    private Element addListItem( Element list, Node item )
-        throws Exception
-    {
-        Document        doc = list.getOwnerDocument();
-        Element         itemElement = doc.createElement( LIST_ELEMENT );
-
-        list.appendChild( itemElement );
-        itemElement.appendChild( item );
-
-        return itemElement;
-    }
-    
-    /**
-     * <p>
-     * Retrieve the indented block inside a section
-     * </p>
-     */
-    private Element getSection( Document doc, int sectionLevel, String sectionName )
-        throws Exception
-    {
-        String          headerTag = makeHeaderTag( sectionLevel );
-        Element     root = doc.getDocumentElement();
-        NodeList    sectionList = root.getElementsByTagName( headerTag );
-        int             count = sectionList.getLength();
-
-        for ( int i = 0; i < count; i++ )
-        {
-            Element     section = (Element) sectionList.item( i );
-            Element     sectionAnchor = getFirstChild( section, ANCHOR );
-
-            if ( sectionName.equals( sectionAnchor.getAttribute( NAME ) ) )
-            {
-                // the next item after the section header, is the indented block
-
-                return (Element) section.getNextSibling();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * <p>
-     * Make the tag for a header, given its level
-     * </p>
-     */
-    private String makeHeaderTag( int headerLevel )
-    {
-        return "h" + Integer.toString( headerLevel );
-    }
-    
-    /**
-     * <p>
-     * Add a paragraph to the end of a parent element.
-     * </p>
-     */
-    private Element addParagraph( Element parent, String text )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Text            textNode = doc.createTextNode( text );
-        Element         paragraph = doc.createElement( PARAGRAPH );
-
-        parent.appendChild( paragraph );
-        paragraph.appendChild( textNode );
-        
-        return paragraph;
-    }
-    
-    /**
-     * <p>
-     * Insert a table at the end of the parent element.
-     * </p>
-     */
-    private Element createTable( Element parent, int borderWidth, String[] columnHeadings )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Element         table = doc.createElement( TABLE );
-        Element         headingRow = insertRow( table );
-        int                     count = columnHeadings.length;
-
-        parent.appendChild( table );
-        table.setAttribute( BORDER, Integer.toString( borderWidth ) );
-
-        for ( int i = 0; i < count; i++ )
-        {
-            Element     headingColumn = insertColumn( headingRow );
-            Element     boldText = boldText( doc, columnHeadings[ i ] );
-
-            headingColumn.appendChild( boldText );
-        }
-
-        return table;
-    }
-    
-    /**
-     * <p>
-     * Insert a row at the end of a table
-     * </p>
-     */
-    private Element insertRow( Element table )
-        throws Exception
-    {
-        Document        doc = table.getOwnerDocument();
-        Element         row = doc.createElement( ROW );
-
-        table.appendChild( row );
-
-        return row;
-    }
-    
-    /**
-     * <p>
-     * Insert a column at the end of a row
-     * </p>
-     */
-    private Element insertColumn( Element row )
-        throws Exception
-    {
-        Document        doc = row.getOwnerDocument();
-        Element         column = doc.createElement( COLUMN );
-
-        row.appendChild( column );
-
-        return column;
-    }
-    
-    /**
-     * <p>
-     * Insert a horizontal line at the end of the parent element.
-     * </p>
-     */
-    private Element insertLine( Element parent )
-        throws Exception
-    {
-        Document        doc = parent.getOwnerDocument();
-        Element         line = doc.createElement( HORIZONTAL_LINE );
-
-        parent.appendChild( line );
-
-        return line;
-    }
-
-    ////////////////////////////////////////////////////////
-    //
-    // XML MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    private Element getFirstChild( Element node, String childName )
-        throws Exception
-    {
-        Element retval = getOptionalChild( node, childName );
-
-        if ( retval == null )
-        {
-            throw new BuildException( "Could not find child element '" + childName + "' in parent element '" + node.getNodeName() + "'." );
-        }
-
-        return retval;
-    }
-
-    private Element getOptionalChild( Element node, String childName )
-        throws Exception
-    {
-        return (Element) node.getElementsByTagName( childName ).item( 0 );
-    }
-
-    /**
-     * <p>
-     * Squeeze the text out of an Element.
-     * </p>
-     */
-    private String squeezeText( Element node )
-        throws Exception
-    {
-        Node        textChild = node.getFirstChild();
-        String      text = textChild.getNodeValue();
-
-        return text;
-    }
-
-    /**
-     * <p>
-     * Clone all of the children of a source node and add them as children
-     * of a target node.
-     * </p>
-     */
-    private void cloneChildren( Node source, Node target )
-        throws Exception
-    {
-        Document    targetDoc = target.getOwnerDocument();
-        NodeList        sourceChildren = source.getChildNodes();
-        int                 count = sourceChildren.getLength();
-
-        for ( int i = 0; i < count; i++ )
-        {
-            Node    sourceChild = sourceChildren.item( i );
-            Node    targetChild = targetDoc.importNode( sourceChild, true );
-
-            target.appendChild( targetChild );
-        }
-    }
-
-    /**
-     * <p>
-     * Replace all instances of the tag with the indicated text.
-     * </p>
-     */
-    private void replaceTag( Document doc, String tag, String replacementText )
-        throws Exception
-    {
-        NodeList        sourceChildren = doc.getElementsByTagName( tag );
-        int                 count = sourceChildren.getLength();
-
-        for ( int i = 0; i < count; i++ )
-        {
-            Node    oldChild = sourceChildren.item( i );
-            Node    newChild = doc.createTextNode( replacementText );
-
-            if ( oldChild != null )
-            {
-                Node    parent = oldChild.getParentNode();
-            
-                if ( parent != null ) { parent.insertBefore( newChild, oldChild ); }
-            }
-        }
-
-        for ( int i = count-1; i > -1; i-- )
-        {
-            Node    oldChild = sourceChildren.item( i );
-
-            if ( oldChild != null )
-            {
-                Node    parent = oldChild.getParentNode();
-            
-                if ( parent != null ) { parent.removeChild( oldChild ); }
-            }
-        }
-    }
-
-    ////////////////////////////////////////////////////////
-    //
-    // JIRA MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    /**
-     * <p>
-     * Get an array of JiraIssues from a JIRA report.
-     * </p>
-     */
-    private JiraIssue[]   getJiraIssues( Document report )
-        throws Exception
-    {
-        Element         reportRoot = report.getDocumentElement();
-        NodeList        itemList = reportRoot.getElementsByTagName( JIRA_ITEM );
-        int                 count = itemList.getLength();
-        JiraIssue[]     issues = new JiraIssue[ count ];
-
-        for ( int i = 0; i < count; i++ ) { issues[ i ] = makeJiraIssue( (Element) itemList.item( i ) ); }
-
-        return issues;
-    }
-
-    /**
-     * <p>
-     * Create a JiraIssue from an <item> element in a JIRA report.
-     * </p>
-     */
-    private JiraIssue   makeJiraIssue( Element itemElement )
-        throws Exception
-    {
-        // the text lives in an anchor
-        Element anchorElement = getFirstChild( itemElement, ANCHOR );
-        String  contents = squeezeText( anchorElement );
-
-        String  key = parseKey( contents );
-        String  title;
-
-        //
-        // A JIRA title has the following form:
-        //
-        //  "[DERBY-2598] new upgrade  test failures after change 528033"
-        //
-        // We strip off the leading JIRA id because that information already
-        // lives in the key.
-        //
-        title = contents.substring( contents.indexOf( ']' ) + 2, contents.length() );        
-
-        return new JiraIssue( key, title );
-    }
-
-    /**
-     * <p>
-     * Parse a string, looking for an id of the form "[DERBY-2598]". Extract the
-     * bit between the brackets.
-     * </p>
-     */
-    private String parseKey( String raw )
-    {
-        int  start = raw.indexOf( '[' );
-        int  end = raw.indexOf( ']' );
-
-        return raw.substring( start + 1, end );
-    }
-
-    ////////////////////////////////////////////////////////
-    //
-    // EXCEPTION PROCESSING MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    /**
-     * <p>
-     * Special processing for special exceptions.
-     * </p>
-     */
-    private  void    processThrowable( Throwable t )
-    {
-        if ( t instanceof java.net.UnknownHostException )
-        {
-            println( "Unknown host '" + t.getMessage() + "'. Can you ping this host from a shell window?" );
-        }
-    }
-
-    /**
-     * <p>
-     * Format an error for later reporting.
-     * </p>
-     */
-    private  String    formatError( String text, Throwable t )
-    {
-        text = text + ": " + t.toString() + "\n" + stringifyStackTrace( t );
-
-        return text;
-    }
-
-    /**
-     * <p>
-     * Print a stack trace as a string.
-     * </p>
-     */
-    private  String stringifyStackTrace( Throwable t )
-    {
-        StringWriter    sw = new StringWriter();
-        PrintWriter     pw = new PrintWriter( sw, true );
-
-        t.printStackTrace( pw );
-        pw.flush();
-        sw.flush();
-
-        return sw.toString();        
-    }
-
-     ////////////////////////////////////////////////////////
-    //
-    // MISC MINIONS
-    //
-    ////////////////////////////////////////////////////////
-
-    private  void    println( String text )
-    {
-        if ( _invokedByAnt )
-        {
-            log( text, Project.MSG_WARN );
-        }
-        else
-        {
-            System.out.println( text );
-        }
-    }
-    
 }

Modified: db/derby/code/branches/10.5/releaseSummary.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/releaseSummary.xml?rev=783062&r1=783061&r2=783062&view=diff
==============================================================================
--- db/derby/code/branches/10.5/releaseSummary.xml (original)
+++ db/derby/code/branches/10.5/releaseSummary.xml Tue Jun  9 16:28:07 2009
@@ -43,6 +43,19 @@
 <previousReleaseID>10.4.2.0</previousReleaseID>
 
 <!--
+    Identifier(s) of previously released versions. Any issue that was fixed in
+    any of these versions will be excluded from the fixed bugs list, and the
+    release notes list.
+
+    E.g.: 10.3.1.4 and 10.3.2.1
+    
+-->
+<excludeReleaseID>10.3.2.1</excludeReleaseID>
+<excludeReleaseID>10.3.3.0</excludeReleaseID>
+<excludeReleaseID>10.4.1.3</excludeReleaseID>
+<excludeReleaseID>10.4.2.0</excludeReleaseID>
+
+<!--
     Information on the system used to build the release.
 -->
 

Modified: db/derby/code/branches/10.5/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/tools/release/build.xml?rev=783062&r1=783061&r2=783062&view=diff
==============================================================================
--- db/derby/code/branches/10.5/tools/release/build.xml (original)
+++ db/derby/code/branches/10.5/tools/release/build.xml Tue Jun  9 16:28:07 2009
@@ -56,7 +56,7 @@
   <property name="relnotes.src.summary" value="${basedir}/releaseSummary.xml" />
   <property name="relnotes.src.buglist" value="${relnotes.src.reports}/fixedBugsList.xml" />
   <property name="relnotes.src.notes" value="${relnotes.src.reports}/releaseNotesList.xml" />
-  <property name="relnotes.out.pamphlet" value="${basedir}/RELEASE-NOTES.html" />
+  <property name="relnotes.out.filename" value="${basedir}/RELEASE-NOTES.html" />
 
 <!-- Define the task which generates the release notes -->
   <taskdef
@@ -112,7 +112,7 @@
        summaryFileName="${relnotes.src.summary}"
        bugListFileName="${relnotes.src.buglist}"
        releaseNotesListFileName="${relnotes.src.notes}"
-       pamphletFileName="${relnotes.out.pamphlet}"
+       outputFileName="${relnotes.out.filename}"
      />
 
   </target>



Mime
View raw message