| author | akozak | 2011-11-25 02:22:50 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:32 (EST) |
| commit | 88f87e8bd5f84056c1c87c229fa1b78df6d50f4e (patch) (side-by-side diff) | |
| tree | 2d5b437d169c8c83099f97aa4bce7c8af9423442 | |
| parent | 5f09e27bbe083fad43835abb35119bfd6411aa7b (diff) | |
| download | org.eclipse.hudson.core-88f87e8bd5f84056c1c87c229fa1b78df6d50f4e.zip org.eclipse.hudson.core-88f87e8bd5f84056c1c87c229fa1b78df6d50f4e.tar.gz org.eclipse.hudson.core-88f87e8bd5f84056c1c87c229fa1b78df6d50f4e.tar.bz2 | |
Resolve Potential ClassCastException for triggers functionality
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
3 files changed, 4 insertions, 4 deletions
diff --git a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly index 90e1210..cdce39d 100644 --- a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly +++ b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly @@ -16,7 +16,7 @@ <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"> - <j:set var="instanceProperty" value="${cu.getBaseProjectProperty(it, descriptor.jsonSafeClassName)}"/> + <j:set var="instanceProperty" value="${cu.getTriggerProjectProperty(it, descriptor.jsonSafeClassName)}"/> <j:set var="instance" value="${instanceProperty.getValue()}"/> <f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec" isPropertyOverridden="${instanceProperty.isOverridden()}"> diff --git a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly index 515e762..c61a054 100644 --- a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly +++ b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly @@ -16,7 +16,7 @@ <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"> - <j:set var="instanceProperty" value="${cu.getBaseProjectProperty(it, descriptor.jsonSafeClassName)}"/> + <j:set var="instanceProperty" value="${cu.getTriggerProjectProperty(it, descriptor.jsonSafeClassName)}"/> <j:set var="instance" value="${instanceProperty.getValue()}"/> <f:entry title="${%Schedule}" field="spec" isPropertyOverridden="${instanceProperty.isOverridden()}"> <f:textarea /> diff --git a/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly b/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly index 25a9565..bd79463 100644 --- a/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly +++ b/hudson-core/src/main/resources/lib/hudson/project/config-trigger.jelly @@ -23,8 +23,8 @@ <j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_"> <j:arg value="${it}" type="hudson.model.Item" /> </j:invokeStatic> - <t:cascadingDescriptorList title="${%Build Triggers}" descriptors="${triggers}" - propertyClass="${org.hudsonci.model.project.property.BaseProjectProperty.class}"> + <t:cascadingDescriptorList title="${%Build Triggers}" descriptors="${triggers}" + propertyClass="${org.eclipse.hudson.api.model.project.property.TriggerProjectProperty.class}"> <d:invokeBody /> <!-- pseudo-trigger to configure URL to trigger builds remotely. --> <st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" /> |