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 3206A200BC8 for ; Wed, 19 Oct 2016 05:27:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 30666160AE5; Wed, 19 Oct 2016 03:27:23 +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 41C06160AFD for ; Wed, 19 Oct 2016 05:27:22 +0200 (CEST) Received: (qmail 33441 invoked by uid 500); 19 Oct 2016 03:27:21 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 33383 invoked by uid 99); 19 Oct 2016 03:27:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 03:27:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C9AF9C2503 for ; Wed, 19 Oct 2016 03:27:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 2uxosxCP4eca for ; Wed, 19 Oct 2016 03:27:18 +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 B8BB25F24B for ; Wed, 19 Oct 2016 03:27:17 +0000 (UTC) Received: (qmail 33007 invoked by uid 99); 19 Oct 2016 03:27:17 -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; Wed, 19 Oct 2016 03:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3C81DFE60; Wed, 19 Oct 2016 03:27:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hao@apache.org To: commits@eagle.incubator.apache.org Date: Wed, 19 Oct 2016 03:27:16 -0000 Message-Id: <679f7884b2ff4acc87cbf4e51a1de5db@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] incubator-eagle git commit: [EAGLE-598] Create 'ui' building profile and enable Eagle Web UI Building by default [Forced Update!] archived-at: Wed, 19 Oct 2016 03:27:23 -0000 Repository: incubator-eagle Updated Branches: refs/heads/master 0474d5916 -> 6dbdb4f72 (forced update) [EAGLE-598] Create 'ui' building profile and enable Eagle Web UI Building by default Create "ui" building profile and enable Eagle Web UI Building by default mvn clean install -DskipTests Could also disable UI building with: mvn clean install -DskipTests -P!ui Or (if "!" is reserved command in OS) mvn clean install -DskipTests -P\!ui Author: Hao Chen Closes #482 from haoch/EAGLE-598. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/0277ff75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/0277ff75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/0277ff75 Branch: refs/heads/master Commit: 0277ff75e10620cdfc17d01823a37719af63995b Parents: 1731612 Author: Hao Chen Authored: Mon Oct 10 15:54:52 2016 +0800 Committer: Hao Chen Committed: Mon Oct 10 15:54:52 2016 +0800 ---------------------------------------------------------------------- eagle-server/pom.xml | 64 +++++++++++++------- .../server/managedtask/ApplicationTask.java | 4 +- eagle-server/ui-build.sh | 5 +- pom.xml | 6 ++ 4 files changed, 53 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0277ff75/eagle-server/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-server/pom.xml b/eagle-server/pom.xml index 99de507..aa190e4 100644 --- a/eagle-server/pom.xml +++ b/eagle-server/pom.xml @@ -157,13 +157,43 @@ + ui + + true + + + + + org.codehaus.mojo + exec-maven-plugin + + + exec-ui-install + generate-sources + + exec + + + bash + + ${basedir}/ui-build.sh + + + + + + + + + + dev true @@ -223,28 +253,16 @@ - - - - - - - - - - - - - - - - - - - - - - + + + org.apache.maven.plugins + maven-checkstyle-plugin + + true + true + + + src/main/webapp/app/ui http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0277ff75/eagle-server/src/main/java/org/apache/eagle/server/managedtask/ApplicationTask.java ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/java/org/apache/eagle/server/managedtask/ApplicationTask.java b/eagle-server/src/main/java/org/apache/eagle/server/managedtask/ApplicationTask.java index d1173a8..b3a1b95 100644 --- a/eagle-server/src/main/java/org/apache/eagle/server/managedtask/ApplicationTask.java +++ b/eagle-server/src/main/java/org/apache/eagle/server/managedtask/ApplicationTask.java @@ -23,10 +23,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ApplicationTask implements Managed { - private final static Logger LOG = LoggerFactory.getLogger(ApplicationTask.class); + private static final Logger LOG = LoggerFactory.getLogger(ApplicationTask.class); private final AbstractScheduledService service; - public ApplicationTask(AbstractScheduledService service){ + public ApplicationTask(AbstractScheduledService service) { this.service = service; } http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0277ff75/eagle-server/ui-build.sh ---------------------------------------------------------------------- diff --git a/eagle-server/ui-build.sh b/eagle-server/ui-build.sh index 9f17ba6..928df1f 100644 --- a/eagle-server/ui-build.sh +++ b/eagle-server/ui-build.sh @@ -15,7 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -echo "=============== Web APP Building Start ===============" +echo "=============== Building Web UI ===============" + echo "Environment Check..." # Pre-build check if [ -z "$(command -v git)" ] @@ -38,3 +39,5 @@ npm install # grunt build echo "building..." npm run build + +echo "=============== Finished ===============" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0277ff75/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d12fb7d..19a1a1d 100755 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,7 @@ 3.0.0 3.5.1 2.10 + 1.4.0 2.6 2.6 2.6 @@ -1110,6 +1111,11 @@ ${maven-assembly.version} + org.codehaus.mojo + exec-maven-plugin + ${maven-exec.version} + + org.apache.maven.plugins maven-dependency-plugin ${maven-dependency.version}