db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r926710 [3/3] - in /db/derby/code/trunk: RELEASE-NOTES.html java/build/org/apache/derbyBuild/JiraIssue.java java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java releaseSummary.xml
Date Tue, 23 Mar 2010 18:32:38 GMT
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/JiraIssue.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/JiraIssue.java?rev=926710&r1=926709&r2=926710&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/JiraIssue.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/JiraIssue.java Tue Mar 23 18:32:38
2010
@@ -25,10 +25,10 @@ import java.util.*;
  */
 class JiraIssue {
     private static final long NO_RELEASE_NOTE = -1;
-    private static final String JIRA_ITEM = "item";
+    private static final String JIRA_ITEM = "h3";
     private static final String JIRA_ID = "id";
     private static final String JIRA_NAME = "name";
-    private static final String JIRA_TITLE = "title";
+    private static final String JIRA_TITLE = "a";
     private static final String JIRA_KEY = "key";
     private static final String JIRA_ATTACHMENT = "attachment";
     private static final String JIRA_FIXVERSION = "fixVersion";
@@ -48,21 +48,11 @@ class JiraIssue {
      */
     public JiraIssue(Element itemElement) throws Exception {
         ElementFacade ef = new ElementFacade(itemElement);
-        key = ef.getTextByTagName(JIRA_KEY);
         title = ef.getTextByTagName(JIRA_TITLE);
+        //key = ef.getTextByTagName(JIRA_KEY);
+        key = parseKey( title );
 
-        NodeList attachmentsList =
-                itemElement.getElementsByTagName(JIRA_ATTACHMENT);
-
-        for (int i = 0; i < attachmentsList.getLength(); i++) {
-            Element attachment = (Element) attachmentsList.item(i);
-            String name = attachment.getAttribute(JIRA_NAME);
-            if (RELEASE_NOTE_NAME.equals(name)) {
-                releaseNoteAttachmentID =
-                        Math.max(releaseNoteAttachmentID,
-                        Long.parseLong(attachment.getAttribute(JIRA_ID)));
-            }
-        }
+        releaseNoteAttachmentID = getReleaseNoteAttachmentID( key, itemElement );
 
         //
         // A JIRA title has the following form:
@@ -81,6 +71,65 @@ class JiraIssue {
     }
 
     /**
+     * Look up the attachment id for the release note attached to
+     * an issue.
+     */
+    private long getReleaseNoteAttachmentID
+        ( String key, Element itemElement )
+        throws Exception
+    {
+        long result = NO_RELEASE_NOTE;
+
+        //
+        // The following code used to work before the time of Derby 10.6.
+        // With that release, the list of attachments stopped appearing in
+        // the xml reports.
+        //
+        //        NodeList attachmentsList =
+        //                itemElement.getElementsByTagName(JIRA_ATTACHMENT);
+        //
+        //        for (int i = 0; i < attachmentsList.getLength(); i++) {
+        //            Element attachment = (Element) attachmentsList.item(i);
+        //            String name = attachment.getAttribute(JIRA_NAME);
+        //            if (RELEASE_NOTE_NAME.equals(name)) {
+        //                result =
+        //                        Math.max(result,
+        //                        Long.parseLong(attachment.getAttribute(JIRA_ID)));
+        //            }
+        //        }
+
+        //
+        // As a consequence, we now hardcode the attachment ids.
+        // The attachment id is in the link of the latest release note
+        // attached to the issue.
+        //
+        if ( key.equals( "DERBY-4432" ) ) { result = 12424709L; }
+        else if ( key.equals( "DERBY-4380" ) ) { result = 12434514L; }
+        else if ( key.equals( "DERBY-4355" ) ) { result = 12419298L; }
+        else if ( key.equals( "DERBY-4312" ) ) { result = 12414219L; }
+        else if ( key.equals( "DERBY-4230" ) ) { result = 12409466L; }
+        else if ( key.equals( "DERBY-4191" ) ) { result = 12430699L; }
+        else if ( key.equals( "DERBY-3991" ) ) { result = 12409798L; }
+        else if ( key.equals( "DERBY-3844" ) ) { result = 12436979L; }
+        else if ( key.equals( "DERBY-2769" ) ) { result = 12418474L; }
+        
+        return result;
+    }
+
+    /**
+     * Extract the JIRA key (DERBY-XXXX) from the raw title.
+     * A JIRA  raw title has the following form:
+     *
+     *  "[DERBY-2598] new upgrade  test failures after change 528033"
+     */
+    private String parseKey( String rawTitle ) throws Exception
+    {
+        String result = rawTitle.substring(1, title.indexOf(']') );
+
+        return result;
+    }
+
+    /**
      * Factory method which extracts a list of JiraIssue objects from a Jira
      * report (supplied as an XML Document). Issues with a fixVersion contained
      * in the exclude list will be omitted from the list.
@@ -111,7 +160,7 @@ class JiraIssue {
             }
             if (!skip)
             {
-                System.out.println("adding: " + candidate.getKey());
+                //System.out.println("adding: " + candidate.getKey());
                 jiraIssues.add(candidate);
             }
         }
@@ -159,7 +208,7 @@ class JiraIssue {
      * @return URL for this Jira issue
      */
     public String getJiraAddress() {
-        return "http://issues.apache.org/jira/browse/" + key;
+        return "https://issues.apache.org/jira/browse/" + key;
     }
 
     /**

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java?rev=926710&r1=926709&r2=926710&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java Tue Mar
23 18:32:38 2010
@@ -301,7 +301,7 @@ public class ReleaseNotesGenerator exten
         for (Iterator i = JiraIssue.createJiraIssueList(bugListDoc,
                 excludeReleaseIDList).iterator(); i.hasNext();) {
             JiraIssue issue = (JiraIssue) i.next();
-            println("Fixed: "+ issue.getKey());
+            //println("Fixed: "+ issue.getKey());
             Element row = insertRow(table);
             Element linkColumn = insertColumn(row);
             Element descriptionColumn = insertColumn(row);

Modified: db/derby/code/trunk/releaseSummary.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/releaseSummary.xml?rev=926710&r1=926709&r2=926710&view=diff
==============================================================================
--- db/derby/code/trunk/releaseSummary.xml (original)
+++ db/derby/code/trunk/releaseSummary.xml Tue Mar 23 18:32:38 2010
@@ -33,7 +33,7 @@ with real information.
     E.g.: 10.2.1.7
 
 -->
-<previousReleaseID>10.5.1.1</previousReleaseID>
+<previousReleaseID>10.5.3.0</previousReleaseID>
 
 <!--
     Identifier(s) of previously released versions. Any issue that was fixed in
@@ -46,21 +46,22 @@ with real information.
 <excludeReleaseID>10.3.3.0</excludeReleaseID>
 <excludeReleaseID>10.4.1.3</excludeReleaseID>
 <excludeReleaseID>10.4.2.0</excludeReleaseID>
-<excludeReleaseID>10.5.1.0</excludeReleaseID>
+<excludeReleaseID>10.5.1.1</excludeReleaseID>
+<excludeReleaseID>10.5.3.0</excludeReleaseID>
 
 <buildInfo>
 
   <!-- Machine environment. E.g.:  Cygwin on Microsoft Windows XP Professional Version
2002 Service Pack 2. -->
-  <machine>Cygwin on Microsoft Windows XP Professional Version 2002 Service Pack 2.</machine>
+  <machine>Mac OS X 10.5.8.</machine>
 
   <!-- Ant version. E.g.:  Apache Ant version 1.6.5 compiled on June 2 2005. -->
-  <antVersion>Apache Ant version 1.6.5 compiled on June 2 2005.</antVersion>
+  <antVersion>Apache Ant version 1.7.1 compiled on June 27 2008.</antVersion>
 
   <!-- Output of "java -version" run from your jdk1.4 installation. E.g.:  Java(TM) 2
Runtime Environment, Standard Edition (build 1.4.2_12-b03). -->
-  <jdk1.4>Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_12-b03).</jdk1.4>
+  <jdk1.4>Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_22-b02-329).</jdk1.4>
 
   <!-- Output of "java -version" run from your Java 6 installation. E.g.:  Java(TM) 2
Runtime Environment, Standard Edition (build 1.6.0-b105). -->
-  <java6> Java(TM) 2 Runtime Environment, Standard Edition (build 1.6.0-b105).</java6>
+  <java6>Java(TM) SE Runtime Environment (build 1.6.0_17-b04-248-9M3125).</java6>
 
   <!--
          Say which compilers you used.
@@ -69,15 +70,14 @@ with real information.
            The 1.4.2_12-b03 javac was used to compile all classes
            except for the JDBC4 drivers. The JDBC4 driver classes were compiled using the
1.6.0-b105 javac.
   -->
-  <compilers>The 1.4.2_12-b03 javac was used to compile all classes
-           except for the JDBC4 drivers. The JDBC4 driver classes were compiled using the
1.6.0-b105 javac.</compilers>
+  <compilers>The 1.6.0_17-b04-248-9M3125 javac was used to compile all classes.</compilers>
 
   <!--
          Say here whether you built the J2ME support and, if so, which
          tookit you used.
          E.g.: J2ME support was built using java.sun.com/j2me (j2me_cdc_fp-1_0_2).
   -->
-  <jsr169>J2ME support was built using java.sun.com/j2me (j2me_cdc_fp-1_0_2).</jsr169>
+  <jsr169>J2ME support was built using libraries from phoneME Advanced Milestone Release
2.</jsr169>
 
 </buildInfo>
 
@@ -104,9 +104,43 @@ Derby functionality includes:
 <newFeatures>
 
 <p>
-This is a minor release. The following new features were added:
+This is a feature release. The following new features were added:
 </p>
 
+<ul>
+
+<li><b>Sequence Generators</b> - Named generators for allocating successive,
evenly spaced numbers. See feature T176 of the SQL Standard.</li>
+	
+<li><b>User-defined types</b> - Named types bound to serializable Java
objects.</li>
+	
+<li><b>Restricted table functions</b> - Limits on the columns and rows
returned by table functions.</li>
+	
+<li><b>XPLAIN statistics collection</b> - Query plan statistics stored
in tables for later analysis.</li>
+
+<li><b>GROUP BY ROLLUP</b> - A subset of the SQL Standard ROLLUP functionality
on the GROUP BY clause. See feature T431 of the SQL Standard.</li>
+	
+<li><b>CROSS JOIN</b> - CROSS JOIN syntax. See features F401-04 of the
SQL Standard.</li>
+	
+<li><b>Named columns join</b> - USING clauses in joins.</li>
+	
+<li><b>SHOW FUNCTIONS</b> - IJ command that lists stored functions.</li>
+	
+<li><b>In-memory back end enhancements</b> - Numerous improvements, including
the ability to delete in-memory databases.</li>
+	
+<li><b>ORDER BY in subqueries</b> - Syntax for explicitly ordering rows
returned by subqueries. See features F851, F852, and F855 of the SQL Standard.</li>
+	
+<li><b>OFFSET, FETCH FIRST/NEXT in subqueries</b> - Generalized syntax
for retrieving row subsets. See features F856, F857, F858, F859, F861, F862, F863, and F864
of the SQL Standard.</li>
+	
+<li><b>NATURAL JOIN</b> - Support for NATURAL JOIN. See feature T431 of
the SQL Standard.</li>
+	
+<li><b>Qualified identifers in ij</b> - Ability to reference cursors and
prepared statements in other connections.</li>
+	
+<li><b>Configurable hash algorithm</b> - Ability to customize the hash
algorithm used by BUILTIN authentication.</li>
+	
+<li><b>Context-sniffing scripts</b> - Ability of shipped scripts to locate
Derby jars when DERBY_HOME isn't set.</li>
+	
+</ul>
+
 </newFeatures>
 
 </summary>



Mime
View raw message