merged back the changes in the RC branch

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

cli/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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

@@ -69,6 +69,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
     private final FilePath base;
     private final String icon;
     private final boolean serveDirIndex;
+    private String indexFileName = "index.html";
 
     /**
      * @deprecated
@@ -115,6 +116,15 @@ public final class DirectoryBrowserSupport implements HttpResponse {
         }
     }
 
+    /**
+     * If the directory is requested but the directory listing is disabled, a file of this name
+     * is served. By default it's "index.html".
+     * @since 1.312
+     */
+    public void setIndexFileName(String fileName) {
+        this.indexFileName = fileName;
+    }
+
     /**
      * Serves a file from the file system (Maps the URL to a directory in a file system.)
      *
@@ -245,7 +255,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
 
             // convert a directory service request to a single file service request by serving
             // 'index.html'
-            baseFile = baseFile.child("index.html");
+            baseFile = baseFile.child(indexFileName);
         }
 
         //serve a single file

core/src/main/java/hudson/scm/browsers/QueryBuilder.java

@@ -24,12 +24,14 @@
 package hudson.scm.browsers;
 
 /**
+ * Builds up a query string.
+ *
  * @author Kohsuke Kawaguchi
 */
-final class QueryBuilder {
+public final class QueryBuilder {
     private final StringBuilder buf = new StringBuilder();
 
-    QueryBuilder(String s) {
+    public QueryBuilder(String s) {
         add(s);
     }
 

debian/changelog

+hudson (1.312) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Tue, 23 Jun 2009 14:08:07 -0700
+
+hudson (1.311) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 19 Jun 2009 19:46:51 -0700
+
 hudson (1.310) 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.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+  <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-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.311-SNAPSHOT</version>
+    <version>1.313-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>