fixed the abstraction and dead JDK/config.jelly is now live.

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

core/src/main/resources/hudson/model/JDK/config.jelly

@@ -26,18 +26,10 @@ THE SOFTWARE.
   Config page
 -->
 <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">
-  <table width="100%">
-    <f:entry title="${%name}" field="name">
-      <f:textbox />
-    </f:entry>
-    <f:entry title="JAVA_HOME" field="home">
-      <f:textbox />
-    </f:entry>   
-    <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties" />
-    <f:entry title="">
-      <div align="right">
-        <f:repeatableDeleteButton value="${%Delete JDK}" />
-      </div>
-    </f:entry>
-  </table>
+  <f:entry title="${%name}" field="name">
+    <f:textbox />
+  </f:entry>
+  <f:entry title="JAVA_HOME" field="home">
+    <f:textbox />
+  </f:entry>
 </j:jelly>
\ No newline at end of file

core/src/main/resources/hudson/tasks/Ant/AntInstallation/global.jelly → core/src/main/resources/hudson/tasks/Ant/AntInstallation/config.jelly

@@ -26,28 +26,10 @@ THE SOFTWARE.
   Config page
 -->
 <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">
-  <f:section title="Ant">
-    <f:entry title="${%Ant installation}"
-      description="${%List of Ant installations on this system}">
-      <f:repeatable name="ant" var="instance" items="${descriptor.installations}" add="${%Add Ant}">
-        <table width="100%">
-          <f:entry title="${%name}" field="name">
-            <f:textbox />
-          </f:entry>
-
-          <f:entry title="ANT_HOME" field="home">
-            <f:textbox />
-          </f:entry>
-
-          <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties" />
-
-          <f:entry title="">
-            <div align="right">
-              <f:repeatableDeleteButton value="${%Delete Ant}" />
-            </div>
-          </f:entry>
-        </table>
-      </f:repeatable>
-    </f:entry>
-  </f:section>
+  <f:entry title="${%name}" field="name">
+    <f:textbox />
+  </f:entry>
+  <f:entry title="ANT_HOME" field="home">
+    <f:textbox />
+  </f:entry>
 </j:jelly>
\ No newline at end of file

core/src/main/resources/hudson/tools/ToolInstallation/config.jelly

+<!--
+The MIT License
+
+Copyright (c) 2009, Sun Microsystems, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+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">
+  <st:documentation>
+    Per ToolInstallation configuration page added to the system configuration.
+    Often this is the only view that you need to override in ToolInstallation.
+    If you need to change the view more drastically, override global.jelly.
+  </st:documentation>
+  <f:entry title="${%Name}" field="name">
+    <f:textbox/>
+  </f:entry>
+  <f:entry title="${%Installation directory}" field="home">
+    <f:textbox/>
+  </f:entry>
+</j:jelly>

core/src/main/resources/hudson/tools/ToolInstallation/config_de.properties

+Name=Name
+Installation\ directory=Installationsverzeichnis

core/src/main/resources/hudson/tools/ToolInstallation/config_ja.properties

+# The MIT License
+#
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Name=\u540D\u524D
+Installation\ directory=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA

core/src/main/resources/hudson/tools/ToolInstallation/global.jelly

@@ -22,24 +22,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 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">
-    <f:section title="${descriptor.displayName}">
-        <f:entry title="${%title(descriptor.displayName)}" description="${%description(descriptor.displayName)}">
-            <f:repeatable name="tool" var="instance" items="${descriptor.installations}" add="${%label.add(descriptor.displayName)}">
-                <table width="100%">
-                    <f:entry title="${%Name}" field="name">
-                        <f:textbox/>
-                    </f:entry>
-                    <f:entry title="${%Installation directory}" field="home">
-                        <f:textbox/>
-                    </f:entry>
-                    <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties"/>
-                    <f:entry title="">
-                        <div align="right">
-                            <f:repeatableDeleteButton value="${%label.delete(descriptor.displayName)}"/>
-                        </div>
-                    </f:entry>
-                </table>
-            </f:repeatable>
-        </f:entry>
-    </f:section>
+  <f:section title="${descriptor.displayName}">
+    <f:entry title="${%title(descriptor.displayName)}" description="${%description(descriptor.displayName)}">
+      <f:repeatable name="tool" var="instance" items="${descriptor.installations}"
+                    add="${%label.add(descriptor.displayName)}">
+        <table width="100%">
+          <st:include page="config.jelly" from="${descriptor}" class="${descriptor.clazz}"/>
+          <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties"/>
+          <f:entry title="">
+            <div align="right">
+              <f:repeatableDeleteButton value="${%label.delete(descriptor.displayName)}"/>
+            </div>
+          </f:entry>
+        </table>
+      </f:repeatable>
+    </f:entry>
+  </f:section>
 </j:jelly>