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

jenkinsci · Mar 17, 2013 · 86ae327 · 86ae327
1 parent 4029ac4
commit 86ae327
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 85 deletions.
diff --git a/src/main/java/hudson/plugins/timestamper/TimestamperConfig.java b/src/main/java/hudson/plugins/timestamper/TimestamperConfig.java
@@ -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;
   }
 

diff --git a/src/main/resources/hudson/plugins/timestamper/TimestamperConfig/config.groovy b/src/main/resources/hudson/plugins/timestamper/TimestamperConfig/config.groovy
diff --git a/src/main/resources/hudson/plugins/timestamper/TimestamperConfig/config.jelly b/src/main/resources/hudson/plugins/timestamper/TimestamperConfig/config.jelly
@@ -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>
diff --git a/...ources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/usersettings.groovy b/...ources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/usersettings.groovy
diff --git a/...sources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/usersettings.jelly b/...sources/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory/usersettings.jelly
@@ -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>
diff --git a/src/test/java/hudson/plugins/timestamper/TimestamperConfigTest.java b/src/test/java/hudson/plugins/timestamper/TimestamperConfigTest.java
@@ -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)));
   }