Skip to content
Permalink
Browse files

[FIXED JENKINS-28972] Workaround to make SimpleBuildSelectorDescripto…

…r usable from other plugins.
  • Loading branch information...
ikedam committed Jun 28, 2015
1 parent e4f0b5d commit 37881e0ace00949137d7ba053208df360640c230
@@ -24,6 +24,7 @@
package hudson.plugins.copyartifact;

import hudson.model.Descriptor;

import org.jvnet.localizer.Localizable;

/**
@@ -45,4 +46,22 @@ public SimpleBuildSelectorDescriptor(Class<? extends BuildSelector> clazz,
public String getDisplayName() {
return displayName.toString();
}

@Override
public String getConfigPage() {
if (!getClass().equals(SimpleBuildSelectorDescriptor.class)) {
return super.getConfigPage();
}
// Workaround for JENKINS-28972, JENKINS-29048
// Jenkins tries to load view file
// not from the plugin the BuildSelector is located,
// but from the plugin the Descriptor is located (JENKINS-29048).
// This cause failures for BuildSelectors
// using SimpleBuildSelectorDescriptor (JENKINS-28972).
return getViewPage(SimpleBuildSelectorDescriptor.class, "config.jelly");
}

public String getBuildSelectorConfigPage() {
return super.getConfigPage();
}
}
@@ -0,0 +1,32 @@
<!--
The MIT License
Copyright (c) 2015 IKEDA Yasuyuki
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.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
<!--
Workaround for JENKINS-28972, JENKINS-29048.
See SimpleBuildSelectorDescriptor#getConfigPage() for details.
-->

<st:include class="${descriptor.clazz}" page="${descriptor.buildSelectorConfigPage}" optional="true" />
</j:jelly>

0 comments on commit 37881e0

Please sign in to comment.
You can’t perform that action at this time.