Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1704C200BD3 for ; Tue, 6 Dec 2016 07:27:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 15BAD160B0C; Tue, 6 Dec 2016 06:27:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37A3F160B29 for ; Tue, 6 Dec 2016 07:27:35 +0100 (CET) Received: (qmail 75635 invoked by uid 500); 6 Dec 2016 06:27:34 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 75626 invoked by uid 99); 6 Dec 2016 06:27:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2016 06:27:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E47641AB321 for ; Tue, 6 Dec 2016 06:27:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id S_Q1WxFNbhwQ for ; Tue, 6 Dec 2016 06:27:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 06E325FBEE for ; Tue, 6 Dec 2016 06:27:30 +0000 (UTC) Received: (qmail 74384 invoked by uid 99); 6 Dec 2016 06:27:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2016 06:27:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B2FBF15AB; Tue, 6 Dec 2016 06:27:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmuehlner@apache.org To: commits@guacamole.incubator.apache.org Date: Tue, 06 Dec 2016 06:27:34 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/12] incubator-guacamole-client git commit: GUACAMOLE-136: Minify JavaScript and CSS. Add templates to Angular's cache. archived-at: Tue, 06 Dec 2016 06:27:36 -0000 GUACAMOLE-136: Minify JavaScript and CSS. Add templates to Angular's cache. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/e9e86126 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/e9e86126 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/e9e86126 Branch: refs/heads/master Commit: e9e8612611fe017862fc25957f904d8ae34baede Parents: f44ee1c Author: Michael Jumper Authored: Fri Dec 2 16:02:47 2016 -0800 Committer: Michael Jumper Committed: Mon Dec 5 22:19:45 2016 -0800 ---------------------------------------------------------------------- extensions/guacamole-auth-duo/.gitignore | 1 + extensions/guacamole-auth-duo/pom.xml | 80 ++++++++++++++++++++ .../src/main/resources/guac-manifest.json | 11 +-- .../src/main/resources/license.txt | 18 +++++ 4 files changed, 101 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e9e86126/extensions/guacamole-auth-duo/.gitignore ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-duo/.gitignore b/extensions/guacamole-auth-duo/.gitignore index 42f4a1a..1de9633 100644 --- a/extensions/guacamole-auth-duo/.gitignore +++ b/extensions/guacamole-auth-duo/.gitignore @@ -1,2 +1,3 @@ +src/main/resources/generated/ target/ *~ http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e9e86126/extensions/guacamole-auth-duo/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml index 4c1fdf6..a55e54f 100644 --- a/extensions/guacamole-auth-duo/pom.xml +++ b/extensions/guacamole-auth-duo/pom.xml @@ -34,6 +34,86 @@ + + + com.keithbranton.mojo + angular-maven-plugin + 0.3.2 + + + generate-resources + + html2js + + + + + ${basedir}/src/main/resources + **/*.html + ${basedir}/src/main/resources/generated/templates-main/templates.js + app/ext/duo + + + + + + com.samaxes.maven + minify-maven-plugin + 1.7.5 + + + default-cli + + UTF-8 + + ${basedir}/src/main/resources + ${project.build.directory}/classes + + / + / + duo.css + + + license.txt + + + + **/*.css + + + / + / + duo.js + + + license.txt + lib/DuoWeb/LICENSE.js + + + + **/*.js + + + + + **/*.test.js + + CLOSURE + + + + OFF + OFF + + + + + minify + + + + + org.apache.maven.plugins http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e9e86126/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json index ff8fab2..27658a8 100644 --- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json @@ -14,18 +14,11 @@ ], "js" : [ - - "duoModule.js", - "controllers/duoSignedResponseController.js", - "config/duoConfig.js", - - "lib/DuoWeb/LICENSE.js", - "lib/DuoWeb/Duo-Web-v2.js" - + "duo.min.js" ], "css" : [ - "styles/duo.css" + "duo.min.css" ], "resources" : { http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e9e86126/extensions/guacamole-auth-duo/src/main/resources/license.txt ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-duo/src/main/resources/license.txt b/extensions/guacamole-auth-duo/src/main/resources/license.txt new file mode 100644 index 0000000..042f3ce --- /dev/null +++ b/extensions/guacamole-auth-duo/src/main/resources/license.txt @@ -0,0 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */