Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9BD981195D for ; Thu, 12 Jun 2014 20:55:35 +0000 (UTC) Received: (qmail 10581 invoked by uid 500); 12 Jun 2014 20:55:35 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 10559 invoked by uid 500); 12 Jun 2014 20:55:35 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 10552 invoked by uid 99); 12 Jun 2014 20:55:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 20:55:35 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 12 Jun 2014 20:55:34 +0000 Received: (qmail 10098 invoked by uid 99); 12 Jun 2014 20:55:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 20:55:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ECAC38C375F; Thu, 12 Jun 2014 20:55:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 12 Jun 2014 20:55:14 -0000 Message-Id: <2692d6a40e4f41c581c2de388f4eb058@git.apache.org> In-Reply-To: <21ae175e45754631a5f40a666bfda9e4@git.apache.org> References: <21ae175e45754631a5f40a666bfda9e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] reorganize how optimization is done: - use US english for consistency - move the optimize config files so they aren't included in generated WAR - reorder so that the same order can be followed in projects which want to use this as a template for cu X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5979ead9/usage/jsgui/src/main/resources/optimise-css.build.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/resources/optimise-css.build.js b/usage/jsgui/src/main/resources/optimise-css.build.js deleted file mode 100644 index 6d19c55..0000000 --- a/usage/jsgui/src/main/resources/optimise-css.build.js +++ /dev/null @@ -1,12 +0,0 @@ -({ - cssIn: "${project.basedir}/src/main/webapp/assets/css/styles.css", - out: "${project.build.webapp}/assets/css/styles.min.css", - - // CSS optimization options are: - // - "standard": @import inlining, comment removal and line returns. - // - "standard.keepLines": like "standard" but keeps line returns. - // - "standard.keepComments": keeps the file comments, but removes line returns. - // - "standard.keepComments.keepLines": keeps the file comments and line returns. - // - "none": skip CSS optimizations. - optimizeCss: "standard" -}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5979ead9/usage/jsgui/src/main/resources/optimise-javascript.build.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/resources/optimise-javascript.build.js b/usage/jsgui/src/main/resources/optimise-javascript.build.js deleted file mode 100644 index 8e2e373..0000000 --- a/usage/jsgui/src/main/resources/optimise-javascript.build.js +++ /dev/null @@ -1,18 +0,0 @@ -({ - // The entry point to the application. Brooklyn's is in config.js. - name: "config", - baseUrl: "${project.basedir}/src/main/webapp/assets/js", - mainConfigFile: "${project.basedir}/src/main/webapp/assets/js/config.js", - paths: { - // Include paths to external resources (e.g. on a CDN) here. - - // Optimiser looks for js/requireLib.js by default. - "requireLib": "libs/require" - }, - - // Place the optimised file in target//assets. - out: "${project.build.webapp}/assets/js/gui.min.js", - - // Set to "none" to skip minification - optimize: "uglify" -})