From 901c4e40139dbb73da776cabe476875a35031add Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 11 Sep 2010 21:04:57 +0000 Subject: [PATCH] Merged revisions 34696,34698-34699,34701,34709 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r34696 | kohsuke | 2010-09-11 08:35:46 -0700 (Sat, 11 Sep 2010) | 1 line setTimeout breaks tests, so instead moving treeview support out from the fragment ........ r34698 | kohsuke | 2010-09-11 08:57:12 -0700 (Sat, 11 Sep 2010) | 1 line error diagnostics improvement ........ r34699 | kohsuke | 2010-09-11 09:48:05 -0700 (Sat, 11 Sep 2010) | 1 line [maven-release-plugin] prepare release hudson-1_376 ........ r34701 | kohsuke | 2010-09-11 09:48:23 -0700 (Sat, 11 Sep 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r34709 | kohsuke | 2010-09-11 11:04:19 -0700 (Sat, 11 Sep 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34712 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/hudson/model/Descriptor.java | 6 ++++-- .../src/main/resources/hudson/matrix/LabelAxis/config.jelly | 4 ---- core/src/main/resources/lib/layout/layout.jelly | 4 ++++ debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 14 files changed, 24 insertions(+), 16 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index bcc4468872..490ed3beae 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.376-SNAPSHOT + 1.377-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 8504cdc313..49cf473a4a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.376-SNAPSHOT + 1.377-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index ab06614045..396ae5af4d 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -490,9 +490,11 @@ public abstract class Descriptor> implements Saveable { } catch (NoSuchMethodException e) { throw new AssertionError(e); // impossible } catch (InstantiationException e) { - throw new Error(e); + throw new Error("Failed to instantiate "+clazz+" from "+formData,e); } catch (IllegalAccessException e) { - throw new Error(e); + throw new Error("Failed to instantiate "+clazz+" from "+formData,e); + } catch (RuntimeException e) { + throw new RuntimeException("Failed to instantiate "+clazz+" from "+formData,e); } } diff --git a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly b/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly index 33d0069104..00be18429b 100644 --- a/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly +++ b/core/src/main/resources/hudson/matrix/LabelAxis/config.jelly @@ -28,11 +28,8 @@ THE SOFTWARE.
- - diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index b4b51ad409..01366d91b6 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -105,6 +105,10 @@ THE SOFTWARE. + + + +