提交 901c4e40 编写于 作者: K kohsuke

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
上级 802f038b
......@@ -4,7 +4,7 @@
<parent>
<artifactId>pom</artifactId>
<groupId>org.jvnet.hudson.main</groupId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
</parent>
<artifactId>cli</artifactId>
<name>Hudson CLI</name>
......
......@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -490,9 +490,11 @@ public abstract class Descriptor<T extends Describable<T>> 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);
}
}
......
......@@ -28,11 +28,8 @@ THE SOFTWARE.
</f:entry>
<f:entry title="${%Node/Label}" field="labels">
<div class="yahooTree labelAxis-tree" style="border: 1px solid gray; height: 10em; overflow:auto;" values="${instance.valueString}" />
<l:yui module="treeview" />
<link rel="stylesheet" href="${rootURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" type="text/css" />
<script>
hudsonRules["DIV.labelAxis-tree"] = function(e) {
setTimeout(function() { // Avoid JS errors (at least in Firefox/Mac)..is there a better way?
var tree = new YAHOO.widget.TreeView(e);
var labels = new YAHOO.widget.TextNode("${%Labels}", tree.getRoot(), false);
......@@ -53,7 +50,6 @@ THE SOFTWARE.
-->
tree.expandAll();
tree.collapseAll();
}, 200); // End of setTimeout()
};
</script>
</f:entry>
......
......@@ -105,6 +105,10 @@ THE SOFTWARE.
<l:yui module="button" />
<!--l:yui module="editor" suffix="-beta" /-->
<!-- TODO: moved here as a temporary fix against HUDSON-7281. Use YUILoader to fix this problem -->
<l:yui module="treeview" />
<link rel="stylesheet" href="${rootURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" type="text/css" />
<script src="${resURL}/scripts/hudson-behavior.js" type="text/javascript"></script>
<script>
......
hudson (1.376) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Sat, 11 Sep 2010 11:01:12 -0700
hudson (1.375) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin</artifactId>
......
......@@ -33,7 +33,7 @@ THE SOFTWARE.
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hudson main module</name>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<artifactId>pom</artifactId>
<groupId>org.jvnet.hudson.main</groupId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.hudson.main</groupId>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
</parent>
<artifactId>ui-samples-plugin</artifactId>
......
......@@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jvnet.hudson.main</groupId>
<artifactId>pom</artifactId>
<version>1.376-SNAPSHOT</version>
<version>1.377-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册