Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-22 10:00:21 -0500
committerWinston Prakash2011-12-01 20:47:01 -0500
commit185241439b8c1c816718fffe717be46d4eea1504 (patch)
treec76f961ae90109007ff332bf8eea675ea894ca73 /hudson-core/src/main/resources/hudson
parent6d53605ff6bdfb4414cd1cf4c431908accc866fa (diff)
downloadorg.eclipse.hudson.core-185241439b8c1c816718fffe717be46d4eea1504.tar.gz
org.eclipse.hudson.core-185241439b8c1c816718fffe717be46d4eea1504.tar.xz
org.eclipse.hudson.core-185241439b8c1c816718fffe717be46d4eea1504.zip
Rename jelly tag attribute 'isCascadingValue' to 'isOverriddenProperty'. Add 'isOverriddenProperty' to f:entry tag. Add ProjectProperty support for AbstractProject.JDK value. Implement legacy test case for jdk conversion
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly6
-rw-r--r--hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly5
-rw-r--r--hudson-core/src/main/resources/hudson/model/Job/configure.jelly2
3 files changed, 7 insertions, 6 deletions
diff --git a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
index 5daf4f0f..9bcdf61c 100644
--- a/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
+++ b/hudson-core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
@@ -57,13 +57,13 @@
checked="${runSequentially}"
field="runSequentially"
title="${%Run each configuration sequentially}"
- isCascadingValue="${runSequentiallyProperty.isPropertyOverridden()}"/>
+ isPropertyOverridden="${runSequentiallyProperty.isPropertyOverridden()}"/>
<j:set var="combinationFilterProperty" value="${it.getStringProperty(it.COMBINATION_FILTER_PROPERTY_NAME)}"/>
<j:set var="combinationFilter" value="${combinationFilterProperty.getValue()}"/>
<f:optionalBlock name="hasCombinationFilter" title="${%Combination Filter}"
checked="${!empty(combinationFilter)}"
- isCascadingValue="${combinationFilterProperty.isPropertyOverridden()}"
+ isPropertyOverridden="${combinationFilterProperty.isPropertyOverridden()}"
help="/help/matrix/combinationfilter.html">
<f:entry title="${%Filter}">
<f:textbox name="combinationFilter" value="${combinationFilter}" />
@@ -74,7 +74,7 @@
<j:set var="touchStoneCombinationFilter" value="${touchStoneCombinationFilterProperty.getValue()}"/>
<f:optionalBlock name="hasTouchStoneCombinationFilter" title="${%Execute touchstone builds first}"
checked="${!empty(touchStoneCombinationFilter)}"
- isCascadingValue="${touchStoneCombinationFilterProperty.isPropertyOverridden()}"
+ isPropertyOverridden="${touchStoneCombinationFilterProperty.isPropertyOverridden()}"
help="/help/matrix/touchstone.html">
<f:entry title="${%Filter}">
<f:textbox name="touchStoneCombinationFilter" value="${touchStoneCombinationFilter}" />
diff --git a/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly b/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
index 8347018d..3215af70 100644
--- a/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
+++ b/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
@@ -29,12 +29,13 @@
<j:if test="${jdks.size() gt 1}">
<!-- if there's only one JDK configured, always use that. -->
<f:entry title="JDK"
- description="${%JDK to be used for this project}">
+ description="${%JDK to be used for this project}"
+ isPropertyOverridden="${it.getStringProperty(it.JDK_PROPERTY_NAME).isPropertyOverridden()}">
<select class="setting-input validated" name="jdk"
checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
<option>${%default.value}</option>
<j:forEach var="inst" items="${jdks}">
- <f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
+ <f:option selected="${inst.name==it.getJDKName()}" value="${inst.name}">${inst.name}</f:option>
</j:forEach>
</select>
</f:entry>
diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
index 80691cd2..3e3c9d80 100644
--- a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
@@ -23,7 +23,7 @@
<st:include page="sidepanel.jelly" />
<l:main-panel>
<div class="behavior-loading">${%LOADING}</div>
- <f:form method="post" action="configSubmit" name="config">
+ <f:form method="post" action="configSubmit" name="config" tableClass="configure">
<j:set var="descriptor" value="${it.descriptor}" />
<j:set var="instance" value="${it}" />

Back to the top