From 5c762750101f12abd51621355a871e42fd9c7a33 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 4 May 2014 23:34:16 +0200
Subject: o Getting the web configuration to work.

---
 .../activemq/ActiveMqGlobalConfig/config.groovy     | 15 +++++++++++++++
 .../plugins/activemq/ActiveMqPlugin/config.jelly    | 10 ----------
 .../plugins/activemq/ActiveMqPlugin/global.jelly    | 21 ---------------------
 .../activemq/ActiveMqPlugin/help-activeMqUrl.html   |  6 ------
 .../plugins/activemq/ActiveMqPlugin/help-name.html  |  6 ------
 5 files changed, 15 insertions(+), 43 deletions(-)
 create mode 100644 src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqGlobalConfig/config.groovy
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/config.jelly
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/global.jelly
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-activeMqUrl.html
 delete mode 100644 src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-name.html

(limited to 'src/main/resources')

diff --git a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqGlobalConfig/config.groovy b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqGlobalConfig/config.groovy
new file mode 100644
index 0000000..7c5cae3
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqGlobalConfig/config.groovy
@@ -0,0 +1,15 @@
+package org.jenkinsci.plugins.activemq.ActiveMqGlobalConfig
+
+def f=namespace(lib.FormTagLib)
+
+f.section(title:_("ActiveMQ Configuration")) {
+    f.entry(title:_("Enable"), field:"enable") {
+        f.checkbox()
+    }
+    f.entry(title:_("Broker URL"), field:"brokerUrl") {
+        f.textbox()
+    }
+//    f.entry(title:_("URL"), field:"url") {
+//        f.textbox(default: "my url")
+//    }
+}
diff --git a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/config.jelly b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/config.jelly
deleted file mode 100644
index 879ae01..0000000
--- a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/config.jelly
+++ /dev/null
@@ -1,10 +0,0 @@
-<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">
-  <f:section title="ActiveMQ Plugin">
-    <f:entry field="enable" title="Enable">
-      <f:checkbox/>
-    </f:entry>
-    <f:entry field="brokerUrl" title="ActiveMQ URL" description="For example tcp://127.0.0.1:61616">
-      <f:textbox/>
-    </f:entry>
-  </f:section>
-</j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/global.jelly b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/global.jelly
deleted file mode 100644
index 6da81e0..0000000
--- a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/global.jelly
+++ /dev/null
@@ -1,21 +0,0 @@
-<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">
-  <!--
-    This Jelly script is used to produce the global configuration option.
-
-    Jenkins uses a set of tag libraries to provide uniformity in forms.
-    To determine where this tag is defined, first check the namespace URI,
-    and then look under $JENKINS/views/. For example, <f:section> is defined
-    in $JENKINS/views/lib/form/section.jelly.
-
-    It's also often useful to just check other similar scripts to see what
-    tags they use. Views are always organized according to its owner class,
-    so it should be straightforward to find them.
-  -->
-<!--
-  <f:section title="ActiveMQ Plugin">
-    <f:entry title="ActiveMq URL" field="brokerUrl" description="yeah yeah">
-      <f:textbox/>
-    </f:entry>
-  </f:section>
--->
-</j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-activeMqUrl.html b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-activeMqUrl.html
deleted file mode 100644
index df2e815..0000000
--- a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-activeMqUrl.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  This HTML fragment will be injected into the configuration screen
-  when the user clicks the 'help' icon. See global.jelly for how the
-  form decides which page to load.
-  You can have any <tt>HTML</tt> fragment here.
-</div>
diff --git a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-name.html b/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-name.html
deleted file mode 100644
index 288f214..0000000
--- a/src/main/resources/org/jenkinsci/plugins/activemq/ActiveMqPlugin/help-name.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Help file for fields are discovered through a file name convention. This file is
-  help for the "name" field. You can have <i>arbitrary</i> HTML here. You can write
-  this file as a Jelly script if you need a dynamic content (but if you do so, change
-  the extension to <tt>.jelly</tt>).
-</div>
-- 
cgit v1.2.3