Merged revisions 22846,22861-22862,22864,22868 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc ........ r22846 | kohsuke | 2009-10-16 12:20:23 -0700 (Fri, 16 Oct 2009) | 1 line [FIXED HUDSON-4456] This problem is fixed toward 1.329. ........ r22861 | kohsuke | 2009-10-16 16:45:02 -0700 (Fri, 16 Oct 2009) | 1 line this is now done asynchronously by Hudson ........ r22862 | kohsuke | 2009-10-16 17:41:53 -0700 (Fri, 16 Oct 2009) | 1 line [maven-release-plugin] prepare release hudson-1_329 ........ r22864 | kohsuke | 2009-10-16 17:42:13 -0700 (Fri, 16 Oct 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r22868 | kohsuke | 2009-10-16 18:20:51 -0700 (Fri, 16 Oct 2009) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22919 71c3de6d-444a-0410-be80-ed276b4c234a

Merged revisions 22846,22861-22862,22864,22868 via svnmerge from
https://svn.dev.java.net/svn/hudson/branches/rc ........ r22846 | kohsuke | 2009-10-16 12:20:23 -0700 (Fri, 16 Oct 2009) | 1 line [FIXED HUDSON-4456] This problem is fixed toward 1.329. ........ r22861 | kohsuke | 2009-10-16 16:45:02 -0700 (Fri, 16 Oct 2009) | 1 line this is now done asynchronously by Hudson ........ r22862 | kohsuke | 2009-10-16 17:41:53 -0700 (Fri, 16 Oct 2009) | 1 line [maven-release-plugin] prepare release hudson-1_329 ........ r22864 | kohsuke | 2009-10-16 17:42:13 -0700 (Fri, 16 Oct 2009) | 1 line [maven-release-plugin] prepare for next development iteration ........ r22868 | kohsuke | 2009-10-16 18:20:51 -0700 (Fri, 16 Oct 2009) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22919 71c3de6d-444a-0410-be80-ed276b4c234a
d3c2d485 · kohsuke · b54cc02c · d3c2d485 · d3c2d485 · d3c2d485
13 changed file
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>pom</artifactId>
    <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
  </parent>
  <artifactId>cli</artifactId>
  <name>Hudson CLI</name>

--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>


--- a/core/src/main/java/hudson/scm/CVSSCM.java
+++ b/core/src/main/java/hudson/scm/CVSSCM.java
@@ -1105,6 +1105,11 @@ public class CVSSCM extends SCM implements Serializable {
            return cvsExe;
        }

+        public void setCvsExe(String value) {
+            this.cvsExe = value;
+            save();
+        }
+
        public String getCvsExeOrDefault() {
            if(Util.fixEmpty(cvsExe)==null)     return "cvs";
            else                                return cvsExe;
@@ -1121,7 +1126,7 @@ public class CVSSCM extends SCM implements Serializable {

        @Override
        public boolean configure( StaplerRequest req, JSONObject o ) {
-            cvsPassFile = fixEmptyAndTrim(req.getParameter("cvspassFile"));
+            cvsPassFile = fixEmptyAndTrim(o.getString("cvspassFile"));
            cvsExe = fixEmptyAndTrim(o.getString("cvsExe"));
            noCompression = req.getParameter("cvs_noCompression")!=null;
            save();

--- a/debian/changelog
+++ b/debian/changelog
+hudson (1.329) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 16 Oct 2009 18:22:38 -0700
+
 hudson (1.328) unstable; urgency=low

  * See http://hudson.dev.java.net/changelog.html for more details.

--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
  </parent>

  <artifactId>maven-plugin</artifactId>

--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
  
  <groupId>org.jvnet.hudson.main</groupId>
  <artifactId>pom</artifactId>
-  <version>1.329-SNAPSHOT</version>
+  <version>1.330-SNAPSHOT</version>
  <packaging>pom</packaging>
  
  <name>Hudson main module</name>

--- a/release.sh
+++ b/release.sh
@@ -73,11 +73,6 @@ jarUrl=$(cat target/upload.log | grep "^Posted" | sed -e "s/Posted //g")
 perl -p -i.bak -e "s|https://.+hudson\.jar|$jarUrl|" $WWW/hudson.jnlp
 cp $WWW/hudson.jnlp $WWW/$id.jnlp

-# push the permalink
-echo "Redirect 302 /latest/hudson.war $warUrl" > /tmp/latest.htaccess.war
-scp /tmp/latest.htaccess.war hudson.gotdns.com:/home/kohsuke/public_html_hudson/latest/.htaccess.war
-ssh hudson.gotdns.com "cd /home/kohsuke/public_html_hudson/latest; cat .htaccess.* > .htaccess"
-
 # update changelog.html
 ruby update.changelog.rb $id < $WWW/changelog.html > $WWW/changelog.new
 mv $WWW/changelog.new $WWW/changelog.html

--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <artifactId>pom</artifactId>
    <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.jvnet.hudson.main</groupId>

--- a/test/src/test/java/hudson/scm/CVSSCMTest.java
+++ b/test/src/test/java/hudson/scm/CVSSCMTest.java
 package hudson.scm;

 import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.Bug;
 import hudson.model.FreeStyleProject;

 /**
@@ -27,6 +28,17 @@ public class CVSSCMTest extends HudsonTestCase {
        assertEquals(scm1, (CVSSCM)p.getScm());
    }

+    @Bug(4456)
+    public void testGlobalConfigRoundtrip() throws Exception {
+        CVSSCM.DescriptorImpl d = hudson.getDescriptorByType(CVSSCM.DescriptorImpl.class);
+        d.setCvspassFile("a");
+        d.setCvsExe("b");
+
+        submit(createWebClient().goTo("configure").getFormByName("config"));
+        assertEquals("a",d.getCvspassFile());
+        assertEquals("b",d.getCvsExe());
+    }
+
    private void roundtrip(FreeStyleProject p) throws Exception {
        submit(new WebClient().getPage(p,"configure").getFormByName("config"));
    }

--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.329-SNAPSHOT</version>
+    <version>1.330-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>