Merged revisions 24685-24686,24706,24708,24710,24713 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r24685 | kohsuke | 2009-12-17 11:42:34 -0800 (Thu, 17 Dec 2009) | 1 line
  
  CR6842690. if the parent directory is missing, create it.
........
  r24686 | kohsuke | 2009-12-17 12:07:35 -0800 (Thu, 17 Dec 2009) | 1 line
  
  doc improvement
........
  r24706 | kohsuke | 2009-12-18 15:29:32 -0800 (Fri, 18 Dec 2009) | 1 line
  
  fixed the problem pointed out by Alan in http://n4.nabble.com/Queue-Task-isConcurrent-tp974571p974571.html
........
  r24708 | kohsuke | 2009-12-18 18:29:14 -0800 (Fri, 18 Dec 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_338
........
  r24710 | kohsuke | 2009-12-18 18:29:25 -0800 (Fri, 18 Dec 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r24713 | kohsuke | 2009-12-18 19:05:36 -0800 (Fri, 18 Dec 2009) | 1 line
  
  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24715 71c3de6d-444a-0410-be80-ed276b4c234a

cli/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>

core/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

core/src/main/java/hudson/model/Queue.java

@@ -247,7 +247,7 @@ public class Queue extends ResourceController implements Saveable {
                     int maxId = 0;
                     for (Object o : list) {
                         if (o instanceof Task) {
-                            // backward compatiblity
+                            // backward compatibility
                             schedule((Task)o, 0);
                         } else if (o instanceof Item) {
                             Item item = (Item)o;
@@ -477,7 +477,7 @@ public class Queue extends ResourceController implements Saveable {
 
     /**
      * @deprecated as of 1.311
-     *      Use {@link #schedule(Task, int, Action[])}
+     *      Use {@link #schedule(Task, int, Action...)} 
      */
     public synchronized boolean add(Task p, int quietPeriod, Action... actions) {
     	return schedule(p, quietPeriod, actions)!=null;
@@ -838,10 +838,16 @@ public class Queue extends ResourceController implements Saveable {
      *  Make sure we don't queue two tasks of the same project to be built
      *  unless that project allows concurrent builds.
      */
-    private boolean allowNewBuildableTask (Task t) {
-           return t.isConcurrentBuild() || !buildables.containsKey(t);
+    private boolean allowNewBuildableTask(Task t) {
+        try {
+            if (t.isConcurrentBuild())
+                return true;
+        } catch (AbstractMethodError e) {
+            // earlier versions don't have the "isConcurrentBuild" method, so fall back gracefully
+        }
+        return !buildables.containsKey(t);
     }
-    
+
     /**
      * Queue maintenance.
      * <p>
@@ -1047,6 +1053,8 @@ public class Queue extends ResourceController implements Saveable {
         
         /**
          * True if the task allows concurrent builds
+         *
+         * @since 1.338
          */
         boolean isConcurrentBuild();
     }

core/src/main/java/hudson/util/AtomicFileWriter.java

@@ -59,10 +59,12 @@ public class AtomicFileWriter extends Writer {
      *      File encoding to write. If null, platform default encoding is chosen.
      */
     public AtomicFileWriter(File f, String encoding) throws IOException {
+        File dir = f.getParentFile();
         try {
-            tmpFile = File.createTempFile("atomic",null,f.getParentFile());
+            dir.mkdirs();
+            tmpFile = File.createTempFile("atomic",null, dir);
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temporary file in "+f.getParentFile(),e);
+            throw new IOException2("Failed to create a temporary file in "+ dir,e);
         }
         destFile = f;
         if (encoding==null)

core/src/main/resources/lib/form/hetero-list.jelly

@@ -24,8 +24,10 @@ THE SOFTWARE.
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:local="local">
   <st:documentation>
-    Outer most tag for creating a heterogeneous list, where the user can add different contents.
-    See Descriptor.newInstancesFromHeteroList for how to parse the submission.
+    Outer most tag for creating a heterogeneous list, where the user can choose arbitrary number of
+    arbitrary items from the given list of descriptors, and configure them independently.
+
+    The submission can be data-bound into List&lt;T> where T is the common base type for the describable instances.
     
     <st:attribute name="name" use="required">
       form name that receives an array for all the items in the heterogeneous list.

debian/changelog

+hudson (1.338) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 18 Dec 2009 19:06:54 -0800
+
 hudson (1.337) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.

maven-agent/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-interceptor/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-plugin/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.338-SNAPSHOT</version>
+  <version>1.339-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>

remoting/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

test/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>

war/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.338-SNAPSHOT</version>
+    <version>1.339-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>