Skip to content
Permalink
Browse files

Workaround JENKINS-16528 by switching from Groovy views to Jelly views

  • Loading branch information...
StevenGBrown committed Mar 17, 2013
1 parent 4029ac4 commit 86ae3272544f4f5b443f3ed5cf3aa965c315b12b
@@ -105,7 +105,7 @@ public String getSystemTimeFormat() {
* @param timestampFormat
* the system clock time format in {@link SimpleDateFormat} pattern
*/
public void setTimestampFormat(String timestampFormat) {
public void setSystemTimeFormat(String timestampFormat) {
this.timestampFormat = timestampFormat;
}

This file was deleted.

@@ -0,0 +1,36 @@
<!--
The MIT License
Copyright (c) 2012 Frederik Fromm
Copyright (c) 2013 Steven G. Brown
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:f="/lib/form">
<f:section title="${%Timestamper}">
<f:entry title="${%System clock time format}" field="systemTimeFormat">
<f:textbox/>
</f:entry>
<f:entry title="${%Elapsed time format}" field="elapsedTimeFormat">
<f:textbox/>
</f:entry>
</f:section>
</j:jelly>

This file was deleted.

@@ -0,0 +1,45 @@
<!--
The MIT License
Copyright (c) 2013 Steven G. Brown
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:l="/lib/layout">
<l:ajax>
<table class="pane">
<tr>
<td class="pane-header">${%Timestamps}</td>
</tr>
<tr>
<td>
<form>
<input type="radio" name="timestamps" id="timestamper-systemTime">${%System clock time}</input>
<br/>
<input type="radio" name="timestamps" id="timestamper-elapsedTime">${%Elapsed time}</input>
<br/>
<input type="radio" name="timestamps" id="timestamper-none">${%None}</input>
</form>
</td>
</tr>
</table>
</l:ajax>
</j:jelly>
@@ -97,7 +97,7 @@ public void testDefaultElapsedTimeFormat() {
@Test
public void testSetSystemTimeFormat() {
TimestamperConfig config = new TimestamperConfig();
config.setTimestampFormat(customSystemTimeFormat);
config.setSystemTimeFormat(customSystemTimeFormat);
assertThat(config.getSystemTimeFormat(), is(customSystemTimeFormat));
}

@@ -115,7 +115,7 @@ public void testSetElapsedTimeFormat() {
@Test
public void testSetSystemTimeFormatEmpty() {
TimestamperConfig config = new TimestamperConfig();
config.setTimestampFormat("");
config.setSystemTimeFormat("");
assertThat(config.getSystemTimeFormat(), is(""));
}

@@ -141,7 +141,7 @@ public void testToXmlDefault() {
@Test
public void testToXmlCustomSystemTimeFormat() {
TimestamperConfig config = new TimestamperConfig();
config.setTimestampFormat(customSystemTimeFormat);
config.setSystemTimeFormat(customSystemTimeFormat);
assertThat(toXml(config), is(xml(customSystemTimeFormat, null)));
}

0 comments on commit 86ae327

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