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 1BBE7200BA2 for ; Sun, 16 Oct 2016 16:03:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1A310160AE2; Sun, 16 Oct 2016 14:03:21 +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 8ACEC160ACE for ; Sun, 16 Oct 2016 16:03:19 +0200 (CEST) Received: (qmail 77788 invoked by uid 500); 16 Oct 2016 14:03:18 -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 77779 invoked by uid 99); 16 Oct 2016 14:03:18 -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; Sun, 16 Oct 2016 14:03:18 +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 3DF40C0062 for ; Sun, 16 Oct 2016 14:03:18 +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 2KahbgWZEjJG for ; Sun, 16 Oct 2016 14:03:16 +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 EC1495FAEE for ; Sun, 16 Oct 2016 14:03:14 +0000 (UTC) Received: (qmail 77759 invoked by uid 99); 16 Oct 2016 14:03:14 -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; Sun, 16 Oct 2016 14:03:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0663FE0061; Sun, 16 Oct 2016 14:03:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: hao@apache.org To: commits@eagle.incubator.apache.org Message-Id: <77bc0176c36e46e78dacdfa0bf7f6a5f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-eagle git commit: [EAGLE-624][UI] Improve ui information and fix bugs Date: Sun, 16 Oct 2016 14:03:14 +0000 (UTC) archived-at: Sun, 16 Oct 2016 14:03:21 -0000 Repository: incubator-eagle Updated Branches: refs/heads/master 1a74b09b7 -> 97edbbbe3 [EAGLE-624][UI] Improve ui information and fix bugs ## Improvements * Show dependencies apps number * Support XML child node tree as String in app docs * Cleanup eagle-server dependencies and output * Move business logic specific logics into dev profile * Rename header and remove pre fo installation content ## Bugs * Fix siteName bug in ui * Installation Doc is not correctly shown in Installation Dialog Author: Hao Chen Closes #513 from haoch/ImproveUIInfo. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/97edbbbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/97edbbbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/97edbbbe Branch: refs/heads/master Commit: 97edbbbe315b9b927bf5e3386a2162e7e4ad99bf Parents: 1a74b09 Author: Hao Chen Authored: Sun Oct 16 22:02:58 2016 +0800 Committer: Hao Chen Committed: Sun Oct 16 22:02:58 2016 +0800 ---------------------------------------------------------------------- ...e.alert.app.AlertUnitTopologyAppProvider.xml | 18 +++ .../config/ApplicationProviderDescConfig.java | 2 +- ...he.eagle.app.TestWebApplication$Provider.xml | 8 ++ .../eagle/metadata/model/ApplicationDocs.java | 10 +- .../metadata/utils/InnerDomAsTextHandler.java | 66 +++++++++ .../metadata/utils/InstallDocDomHandler.java | 23 +++ .../metadata/utils/UninstallDocDomHandler.java | 23 +++ eagle-server-assembly/pom.xml | 9 -- eagle-server/pom.xml | 141 +++++++++++-------- .../org/apache/eagle/server/ServerMain.java | 11 +- .../app/dev/partials/integration/site.html | 43 +++--- .../app/dev/public/js/ctrls/integrationCtrl.js | 4 + 12 files changed, 261 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml index 8e386be..b3e777c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/resources/META-INF/providers/org.apache.eagle.alert.app.AlertUnitTopologyAppProvider.xml @@ -128,8 +128,26 @@ +
+ +
    +
  1. Require permission to READ/WRITE/CREATE on kafka topic
    2. +
+ +
    +
  1. Configure kafka connection in settings
    2. +
  2. Install and start alert engine
    3. +
  3. Integrate streams and define policy
    4. +
+
+
+ +
    +
  1. Clean up kafka topics automatically created by alert engine
    2. +
+
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java index 2d2b7e2..0a8b81f 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/config/ApplicationProviderDescConfig.java @@ -1,4 +1,4 @@ -/** +/* * 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. http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml index 5456bce..19aa5e8 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml +++ b/eagle-core/eagle-app/eagle-app-base/src/test/resources/META-INF/providers/org.apache.eagle.app.TestWebApplication$Provider.xml @@ -27,4 +27,12 @@ 0.5.0-incubating + + +

Installation Guide

+ + +

Un-installation Guide

+ + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDocs.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDocs.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDocs.java index f83f377..6aafa90 100644 --- a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDocs.java +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationDocs.java @@ -16,18 +16,26 @@ */ package org.apache.eagle.metadata.model; +import org.apache.eagle.metadata.utils.InstallDocDomHandler; +import org.apache.eagle.metadata.utils.UninstallDocDomHandler; + +import javax.xml.bind.annotation.XmlAnyElement; + public class ApplicationDocs { private String install; + private String uninstall; public String getInstall() { return install; } + @XmlAnyElement(value=InstallDocDomHandler.class) public void setInstall(String install) { this.install = install; } + @XmlAnyElement(value= UninstallDocDomHandler.class) public String getUninstall() { return uninstall; } @@ -35,4 +43,4 @@ public class ApplicationDocs { public void setUninstall(String uninstall) { this.uninstall = uninstall; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InnerDomAsTextHandler.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InnerDomAsTextHandler.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InnerDomAsTextHandler.java new file mode 100644 index 0000000..1358fff --- /dev/null +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InnerDomAsTextHandler.java @@ -0,0 +1,66 @@ +/* + * 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. + */ + +package org.apache.eagle.metadata.utils; + +import javax.xml.bind.ValidationEventHandler; +import javax.xml.bind.annotation.DomHandler; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.StringReader; +import java.io.StringWriter; + +public abstract class InnerDomAsTextHandler implements DomHandler { + private final String startTag; + private final String endTag; + private StringWriter xmlWriter = new StringWriter(); + + /** + * Default constructor. + * + * It is up to a JAXB provider to decide which DOM implementation + * to use or how that is configured. + */ + public InnerDomAsTextHandler(String tagName) { + this.startTag = String.format("<%s>",tagName); + this.endTag = String.format("",tagName); + } + + @Override + public StreamResult createUnmarshaller(ValidationEventHandler errorHandler) { + return new StreamResult(xmlWriter); + } + + @Override + public String getElement(StreamResult rt) { + String xml = rt.getWriter().toString(); + int beginIndex = xml.indexOf(startTag) + startTag.length(); + int endIndex = xml.indexOf(endTag); + return xml.substring(beginIndex, endIndex); + } + + @Override + public Source marshal(String n, ValidationEventHandler errorHandler) { + try { + StringReader xmlReader = new StringReader(n); + return new StreamSource(xmlReader); + } catch(Exception e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InstallDocDomHandler.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InstallDocDomHandler.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InstallDocDomHandler.java new file mode 100644 index 0000000..ae84c29 --- /dev/null +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/InstallDocDomHandler.java @@ -0,0 +1,23 @@ +/* + * 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. + */ +package org.apache.eagle.metadata.utils; + +public class InstallDocDomHandler extends InnerDomAsTextHandler { + public InstallDocDomHandler() { + super("install"); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/UninstallDocDomHandler.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/UninstallDocDomHandler.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/UninstallDocDomHandler.java new file mode 100644 index 0000000..c1812c4 --- /dev/null +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/utils/UninstallDocDomHandler.java @@ -0,0 +1,23 @@ +/* + * 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. + */ +package org.apache.eagle.metadata.utils; + +public class UninstallDocDomHandler extends InnerDomAsTextHandler { + public UninstallDocDomHandler() { + super("uninstall"); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-server-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-server-assembly/pom.xml b/eagle-server-assembly/pom.xml index 3bc888e..b080335 100644 --- a/eagle-server-assembly/pom.xml +++ b/eagle-server-assembly/pom.xml @@ -29,20 +29,11 @@ eagle-server-assembly http://maven.apache.org - - - - org.apache.eagle eagle-server ${project.version} - - - - - http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-server/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-server/pom.xml b/eagle-server/pom.xml index 7fe4397..37ba4f2 100644 --- a/eagle-server/pom.xml +++ b/eagle-server/pom.xml @@ -26,57 +26,13 @@ 0.5.0-incubating-SNAPSHOT 4.0.0 - eagle-server + Eagle::Server + + Apache Eagle Server + - io.dropwizard - dropwizard-core - - - org.slf4j - log4j-over-slf4j - - - - - io.dropwizard - dropwizard-jersey - - - org.slf4j - slf4j-log4j12 - - - - - io.swagger - swagger-jersey-jaxrs - compile - - - com.sun.jersey - * - - - com.sun.jersey.contribs - * - - - - - com.typesafe - config - - - com.hubspot.dropwizard - dropwizard-guice - - - io.dropwizard - dropwizard-assets - - org.apache.eagle alert-metadata-service ${project.version} @@ -145,25 +101,19 @@ org.apache.eagle - eagle-app-example - ${project.version} - - - org.apache.eagle - eagle-security-hbase-auditlog + eagle-entity-base ${project.version} org.slf4j + log4j-over-slf4j + + + org.slf4j slf4j-log4j12 - - org.apache.eagle - eagle-security-hbase-web - ${project.version} - @@ -174,6 +124,53 @@ io.dropwizard + dropwizard-core + + + org.slf4j + log4j-over-slf4j + + + + + io.dropwizard + dropwizard-jersey + + + org.slf4j + slf4j-log4j12 + + + + + io.swagger + swagger-jersey-jaxrs + compile + + + com.sun.jersey + * + + + com.sun.jersey.contribs + * + + + + + com.typesafe + config + + + com.hubspot.dropwizard + dropwizard-guice + + + io.dropwizard + dropwizard-assets + + + io.dropwizard dropwizard-auth @@ -216,6 +213,7 @@ dev + true @@ -224,6 +222,31 @@ ========================================================================================================= --> + + + org.apache.eagle + eagle-app-example + ${project.version} + + + + + org.apache.eagle + eagle-security-hbase-auditlog + ${project.version} + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.eagle + eagle-security-hbase-web + ${project.version} + + org.apache.eagle http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java b/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java index a944265..cdb243e 100644 --- a/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java +++ b/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java @@ -19,16 +19,15 @@ package org.apache.eagle.server; public class ServerMain { public static void main(String[] args) { System.out.println( - "Welcome to Apache Eagle (Incubating)\n" - + "---------------" - ); - System.out.println( - "Starting Eagle Server ..." + "----------------------------\n" + + " Apache Eagle™ (Incubating)\n" + + "----------------------------" ); + System.out.println("\nStarting Eagle Server ...\n"); try { new ServerApplication().run(args); } catch (Exception e) { - System.err.println("Got exception: " + e.getMessage()); + System.err.println("Oops, got error to start eagle server: " + e.getMessage()); e.printStackTrace(); System.exit(1); } http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-server/src/main/webapp/app/dev/partials/integration/site.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html index 6b02a70..db6b7c7 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html +++ b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html @@ -21,7 +21,7 @@

- +
@@ -84,7 +84,7 @@
- +
@@ -106,9 +106,9 @@
@@ -180,10 +180,10 @@
- 

+						

 					

 					

-						

+						

 					

 				

 			

@@ -206,27 +206,28 @@
 			
 			

 				
 
 				

 					

-						
-						
    
-							
  • 
-								[ Installed ]
-								[
-									Require
-								]
-								{{Application.findProvider(dep.type).name}}
-								({{dep.type}})
-							
    • 
-						

+						

 
-						
-						

+						

+							
+							
    
+								
  • 
+									[ Installed ]
+									[
+										Missing
+									]
+									{{Application.findProvider(dep.type).name}}
+									({{dep.type}})
+								
    • 
+							

+						

 					

 
 					


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/97edbbbe/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
index e53a11e..9b46814 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
@@ -234,6 +234,10 @@
 			application = application.origin;
 			$scope.installLock = false;
 			$scope.application = application;
+
+			var docs = application.docs || {install: "", uninstall: ""};
+			$scope.installHTML = $sce.trustAsHtml(docs.install);
+
 			$scope.tmpApp = {
 				mode: "CLUSTER",
 				jarPath: application.jarPath,