From fedf4ac9acd36fdf3f5903f28e00e5d1b3013cf2 Mon Sep 17 00:00:00 2001 From: Abbe98 Date: Wed, 4 Jan 2023 16:09:30 +0100 Subject: [PATCH] remove LESS support Following OpenRefine/OpenRefine #5525 --- main/pom.xml | 5 --- .../simile/butterfly/ButterflyModuleImpl.java | 32 ---------------- modules.properties | 3 -- modules/samples/examples/index.vt | 5 --- .../less-examples/MOD-INF/module.properties | 5 --- modules/samples/less-examples/index.html | 37 ------------------- .../samples/less-examples/styles/common.less | 16 -------- .../styles/panels/panel-one/panel.less | 12 ------ .../styles/panels/panel-two/panel.less | 12 ------ .../less-examples/styles/panels/panels.less | 17 --------- 10 files changed, 144 deletions(-) delete mode 100644 modules/samples/less-examples/MOD-INF/module.properties delete mode 100644 modules/samples/less-examples/index.html delete mode 100644 modules/samples/less-examples/styles/common.less delete mode 100644 modules/samples/less-examples/styles/panels/panel-one/panel.less delete mode 100644 modules/samples/less-examples/styles/panels/panel-two/panel.less delete mode 100644 modules/samples/less-examples/styles/panels/panels.less diff --git a/main/pom.xml b/main/pom.xml index 109e75a..74ecfd2 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -92,11 +92,6 @@ javax.servlet-api 4.0.1 - - com.metaweb - lessen - 1.0 - org.slf4j slf4j-api diff --git a/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java b/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java index ed8e8f6..65756f5 100644 --- a/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java +++ b/main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java @@ -50,11 +50,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.metaweb.lessen.Utilities; -import com.metaweb.lessen.tokenizers.CondensingTokenizer; -import com.metaweb.lessen.tokenizers.IndentingTokenizer; -import com.metaweb.lessen.tokenizers.Tokenizer; - /** * This class is the base implementation of ButterflyModule and @@ -447,10 +442,6 @@ public boolean process(String path, HttpServletRequest request, HttpServletRespo return sendText(request, response, path, encoding, "text/css",false); } - if (path.endsWith(".less")) { - return sendLessen(request, response, path, encoding, "text/css",false); - } - if (path.endsWith(".html")) { return sendText(request, response, path, encoding, "text/html",false); } @@ -523,29 +514,6 @@ public boolean sendTextFromTemplate(HttpServletRequest request, HttpServletRespo _logger.trace("< template {} [{}|{}]", new String[] { template, encoding, mimeType }); return true; } - - public boolean sendLessen(HttpServletRequest request, HttpServletResponse response, String path, String encoding, String mimeType, boolean absolute) throws Exception { - URL url = getResource(path); - - Map variables = new HashMap(); - variables.put("module", _name); - - Tokenizer tokenizer = Utilities.openLess(url, variables); - tokenizer = new CondensingTokenizer(tokenizer, false); - tokenizer = new IndentingTokenizer(tokenizer); - - return sendLessenTokenStream(request, response, tokenizer, encoding, "text/css",false); - } - - public boolean sendLessenTokenStream(HttpServletRequest request, HttpServletResponse response, Tokenizer tokenizer, String encoding, String mimeType, boolean absolute) throws Exception { - try { - response.setContentType(mimeType); - Utilities.write(tokenizer, getFilteringWriter(request, response, absolute)); - } catch (ResourceNotFoundException e) { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - return true; - } public boolean sendString(HttpServletRequest request, HttpServletResponse response, String str, String encoding, String mimeType) throws Exception { _logger.trace("> string: '{}'", str); diff --git a/modules.properties b/modules.properties index 210bf70..d3b0755 100644 --- a/modules.properties +++ b/modules.properties @@ -12,9 +12,6 @@ examples.skin = modern extended-examples = /examples/ extended-examples.skin = modern -less-examples = /less/ -less-examples.skin = modern - modern = /skin/ jquery = /lib/jquery/ diff --git a/modules/samples/examples/index.vt b/modules/samples/examples/index.vt index cfa678a..ea61094 100644 --- a/modules/samples/examples/index.vt +++ b/modules/samples/examples/index.vt @@ -7,8 +7,3 @@ - - - diff --git a/modules/samples/less-examples/MOD-INF/module.properties b/modules/samples/less-examples/MOD-INF/module.properties deleted file mode 100644 index 00c793f..0000000 --- a/modules/samples/less-examples/MOD-INF/module.properties +++ /dev/null @@ -1,5 +0,0 @@ -description = Butterfly Examples Module - -implements = samples -requires = skin -templating = false \ No newline at end of file diff --git a/modules/samples/less-examples/index.html b/modules/samples/less-examples/index.html deleted file mode 100644 index 3da5ad7..0000000 --- a/modules/samples/less-examples/index.html +++ /dev/null @@ -1,37 +0,0 @@ - - - LESS Example - - - - - -

LESS Example

- -
-

Panel One

-

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris - nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in - reprehenderit in voluptate velit esse cillum dolore eu fugiat - nulla pariatur. Excepteur sint occaecat cupidatat non proident, - sunt in culpa qui officia deserunt mollit anim id est laborum. -

-
- -
-

Panel Two

-

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. - Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris - nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in - reprehenderit in voluptate velit esse cillum dolore eu fugiat - nulla pariatur. Excepteur sint occaecat cupidatat non proident, - sunt in culpa qui officia deserunt mollit anim id est laborum. -

-
- - \ No newline at end of file diff --git a/modules/samples/less-examples/styles/common.less b/modules/samples/less-examples/styles/common.less deleted file mode 100644 index 7948571..0000000 --- a/modules/samples/less-examples/styles/common.less +++ /dev/null @@ -1,16 +0,0 @@ -// Root definitions - -@text-color: #003366; -@link-color: #3300aa; - -.round-corners(@radius: 10px, @thickness: 2px, @color: gray) { - -moz-border-radius: @radius; - -webkit-border-radius: @radius; - border-radius: @radius; - border: @thickness solid @color; -} - -body { - color: @text-color; -} - diff --git a/modules/samples/less-examples/styles/panels/panel-one/panel.less b/modules/samples/less-examples/styles/panels/panel-one/panel.less deleted file mode 100644 index d0719b5..0000000 --- a/modules/samples/less-examples/styles/panels/panel-one/panel.less +++ /dev/null @@ -1,12 +0,0 @@ -// Definitions for panel-one only - -@import url("../panels.less"); // this import statement will be kept in the output - -#$module-panel-two { - background: #eee; -} - -#$module-panel-two h2 { - color: @text-color; - margin: 0; -} \ No newline at end of file diff --git a/modules/samples/less-examples/styles/panels/panel-two/panel.less b/modules/samples/less-examples/styles/panels/panel-two/panel.less deleted file mode 100644 index de1ad57..0000000 --- a/modules/samples/less-examples/styles/panels/panel-two/panel.less +++ /dev/null @@ -1,12 +0,0 @@ -// Definitions for panel-one only - -@import url("../panels.less"); // this import statement will be kept in the output - -#$module-panel-one { - background: #fffee0; -} - -#$module-panel-one h2 { - color: @text-color; - margin: 0; -} diff --git a/modules/samples/less-examples/styles/panels/panels.less b/modules/samples/less-examples/styles/panels/panels.less deleted file mode 100644 index b422232..0000000 --- a/modules/samples/less-examples/styles/panels/panels.less +++ /dev/null @@ -1,17 +0,0 @@ -// Definitions shared among panels - -@import-less url("../common.less"); // this import statement will NOT be kept in the output - -@text-size: 12pt; -@text-color: #663300; // overrides same definition in common.less - -.$module-panel { - @padding: 20px; - @radius: @padding * 0.75; - - padding: @padding; - margin: @padding / 2 0; - - .round-corners (@radius, 3px, lightgray); -} -