| author | akozak | 2011-11-28 05:20:13 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:38 (EST) |
| commit | a98a62b6914e824437a9abb5cd74e7785ff6bafb (patch) (side-by-side diff) | |
| tree | af6b08890504384881acacacc8eeeeee13a4ce19 | |
| parent | caccde212ff9272cd82901b5872adc65fbc26f4f (diff) | |
| download | org.eclipse.hudson.core-a98a62b6914e824437a9abb5cd74e7785ff6bafb.zip org.eclipse.hudson.core-a98a62b6914e824437a9abb5cd74e7785ff6bafb.tar.gz org.eclipse.hudson.core-a98a62b6914e824437a9abb5cd74e7785ff6bafb.tar.bz2 | |
JDK automatic installer temporarily disabled because of NPE at hudson tools.JDKInstaller.locateStage1(JDKInstaller.java:347). The reason is changed oracle JDK download page.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.jelly | 17 | ||||
| -rw-r--r-- | hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.properties | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.jelly b/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.jelly index 7f4f701..219dca6 100644 --- a/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.jelly +++ b/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.jelly @@ -22,8 +22,19 @@ <j:set var="toolDescriptor" value="${descriptor}" /><!-- to make this descriptor accessible from properties --> <table width="100%"> <st:include page="config.jelly" from="${descriptor}" class="${descriptor.clazz}"/> - <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties"/> - <f:entry title=""> + <!-- TODO enable JDK installer when it will be ready --> + <j:choose> + <j:when test="${descriptor.displayName=='JDK'}"> + <tr> + <td colspan="2"/> + <td><div style="text-align:left; color:red; font-weight:bold">${%jdk.installed.disabled}</div></td> + </tr> + </j:when> + <j:otherwise> + <f:descriptorList descriptors="${descriptor.propertyDescriptors}" field="properties"/> + </j:otherwise> + </j:choose> + <f:entry title=""> <div align="right"> <f:repeatableDeleteButton value="${%label.delete(descriptor.displayName)}"/> </div> @@ -32,4 +43,4 @@ </f:repeatable> </f:entry> </f:section> -</j:jelly> +</j:jelly>
\ No newline at end of file diff --git a/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.properties b/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.properties index 15c0324..e2d4679 100644 --- a/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.properties +++ b/hudson-core/src/main/resources/hudson/tools/ToolInstallation/global.properties @@ -18,3 +18,5 @@ title={0} installations description=List of {0} installations on this system label.add=Add {0} label.delete=Delete {0} +jdk.installed.disabled=JDK automatic installer temporarily disabled, please install JDK manually and specify valid JAVA_HOME + |