incubator-eagle git commit: [EAGLE-615] Jsoup parse hive sql return String without line break "\n"

2016-10-16 Thread hao 
Repository: incubator-eagle
Updated Branches:
  refs/heads/master a6bc0a524 -> a710082d4


[EAGLE-615] Jsoup parse hive sql return String without line break "\n"

EAGLE-615 Jsoup parse hive sql return String without line break "\n"
- ADD "doc.outputSettings().prettyPrint(false);", get element value via 
getWholeText() not text()

Author: chitin 

Closes #499 from chitin/EAGLE615.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/a710082d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/a710082d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/a710082d

Branch: refs/heads/master
Commit: a710082d486e10b4732c00a06dd367dc556df60a
Parents: a6bc0a5
Author: chitin 
Authored: Mon Oct 17 11:42:27 2016 +0800
Committer: Hao Chen 
Committed: Mon Oct 17 11:42:27 2016 +0800

--
 .../hive/jobrunning/HiveJobFetchSpout.java  | 35 +++-
 1 file changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a710082d/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java
--
diff --git 
a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java
 
b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java
index c0673b3..af4599b 100644
--- 
a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java
+++ 
b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java
@@ -22,6 +22,7 @@ import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import backtype.storm.tuple.Fields;
+import org.apache.commons.lang.StringUtils;
 import org.apache.eagle.dataproc.impl.storm.ValuesArray;
 import org.apache.eagle.jpm.util.*;
 import org.apache.eagle.jpm.util.jobrecover.RunningJobManager;
@@ -35,12 +36,14 @@ import 
org.apache.eagle.security.hive.config.RunningJobCrawlConfig;
 import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.jsoup.Jsoup;
+import org.jsoup.nodes.TextNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.InputStream;
@@ -62,6 +65,7 @@ public class HiveJobFetchSpout extends BaseRichSpout {
 private Long lastFinishAppTime;
 private RunningJobManager runningJobManager;
 private int partitionId;
+
 static {
 OBJ_MAPPER.configure(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS, 
true);
 }
@@ -91,22 +95,22 @@ public class HiveJobFetchSpout extends BaseRichSpout {
 // sanity verify 0<=partitionId<=numTotalPartitions-1
 if (partitionId < 0 || partitionId > 
crawlConfig.controlConfig.numTotalPartitions) {
 throw new IllegalStateException("partitionId should be less than 
numTotalPartitions with partitionId " +
-partitionId + " and numTotalPartitions " + 
crawlConfig.controlConfig.numTotalPartitions);
+partitionId + " and numTotalPartitions " + 
crawlConfig.controlConfig.numTotalPartitions);
 }
 Class partitionerCls = 
crawlConfig.controlConfig.partitionerCls;
 try {
 this.jobFilter = new 
JobIdFilterByPartition(partitionerCls.newInstance(),
-crawlConfig.controlConfig.numTotalPartitions, partitionId);
+crawlConfig.controlConfig.numTotalPartitions, partitionId);
 } catch (Exception e) {
 LOG.error("failing instantiating job partitioner class " + 
partitionerCls.getCanonicalName());
 throw new IllegalStateException(e);
 }
 this.collector = collector;
 this.runningJobManager = new 
RunningJobManager(crawlConfig.zkStateConfig.zkQuorum,
-crawlConfig.zkStateConfig.zkSessionTimeoutMs,
-crawlConfig.zkStateConfig.zkRetryTimes,
-crawlConfig.zkStateConfig.zkRetryInterval,
-crawlConfig.zkStateConfig.zkRoot);
+crawlConfig.zkStateConfig.zkSessionTimeoutMs,
+crawlConfig.zkStateConfig.zkRetryTimes,
+crawlConfig.zkStateConfig.zkRetryInterval,
+crawlConfig.zkStateConfig.zkRoot);
 this.lastFinishAppTime =

incubator-eagle git commit: [MINOR] Add missed license header in BasicAuthProviderBuilder

2016-10-16 Thread hao 
Repository: incubator-eagle
Updated Branches:
  refs/heads/master b103e201e -> e8a73893d


[MINOR] Add missed license header in BasicAuthProviderBuilder


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/e8a73893
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/e8a73893
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/e8a73893

Branch: refs/heads/master
Commit: e8a73893d5d395fdba3716717f728e8768ae
Parents: b103e20
Author: Hao Chen 
Authored: Mon Oct 17 11:10:16 2016 +0800
Committer: Hao Chen 
Committed: Mon Oct 17 11:10:16 2016 +0800

--
 .../authentication/BasicAuthProviderBuilder.java| 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/e8a73893/eagle-server/src/main/java/org/apache/eagle/server/authentication/BasicAuthProviderBuilder.java
--
diff --git 
a/eagle-server/src/main/java/org/apache/eagle/server/authentication/BasicAuthProviderBuilder.java
 
b/eagle-server/src/main/java/org/apache/eagle/server/authentication/BasicAuthProviderBuilder.java
index e0bb4c1..855134b 100644
--- 
a/eagle-server/src/main/java/org/apache/eagle/server/authentication/BasicAuthProviderBuilder.java
+++ 
b/eagle-server/src/main/java/org/apache/eagle/server/authentication/BasicAuthProviderBuilder.java
@@ -1,3 +1,19 @@
+/*
+ * 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.server.authentication;
 
 import com.google.common.cache.CacheBuilderSpec;

incubator-eagle git commit: [EAGLE-621] set authentication disabled by default when no 'auth' is configured

2016-10-16 Thread mw 
Repository: incubator-eagle
Updated Branches:
  refs/heads/master 33b972065 -> b103e201e


[EAGLE-621] set authentication disabled by default when no 'auth' is configured

Authentication settings are configured in configuration.yml file, starting with 
"auth" syntax. Now make the system see authentication as disabled when no auth 
related syntax is set.

Also, do some refactoring to make the code clearer.

Author: anyway1021 

Closes #514 from anyway1021/EAGLE-621.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/b103e201
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/b103e201
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/b103e201

Branch: refs/heads/master
Commit: b103e201ebe7b1500ba3d0297bb7aa88e7aa811a
Parents: 33b9720
Author: anyway1021 
Authored: Mon Oct 17 10:44:36 2016 +0800
Committer: anyway1021 
Committed: Mon Oct 17 10:44:36 2016 +0800

--
 .../apache/eagle/server/ServerApplication.java  |   8 +-
 .../authentication/AuthenticationMode.java  |  51 -
 .../AuthenticationModeIdentifier.java   | 105 ---
 .../authentication/AuthenticationRegister.java  |  41 
 .../BasicAuthProviderBuilder.java   |  66 
 .../SwitchableBasicAuthProvider.java|  50 -
 .../AbstractSwitchableAuthenticator.java|  48 -
 .../authenticator/LdapBasicAuthenticator.java   |  11 +-
 .../authenticator/SimpleBasicAuthenticator.java |  12 +--
 9 files changed, 82 insertions(+), 310 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/b103e201/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
--
diff --git 
a/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java 
b/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
index 2ae95a6..df1d7e7 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.eagle.server;
+
 import com.google.inject.Injector;
 import com.hubspot.dropwizard.guice.GuiceBundle;
 import com.sun.jersey.api.core.PackagesResourceConfig;
@@ -27,11 +28,10 @@ import io.swagger.jaxrs.config.BeanConfig;
 import io.swagger.jaxrs.listing.ApiListingResource;
 import org.apache.eagle.alert.coordinator.CoordinatorListener;
 import org.apache.eagle.alert.resource.SimpleCORSFiler;
-import org.apache.eagle.common.authentication.User;
 import org.apache.eagle.log.base.taggedlog.EntityJsonModule;
 import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
 import org.apache.eagle.metadata.service.ApplicationStatusUpdateService;
-import org.apache.eagle.server.authentication.AuthenticationRegister;
+import org.apache.eagle.server.authentication.BasicAuthProviderBuilder;
 import org.apache.eagle.server.managedtask.ApplicationTask;
 import org.apache.eagle.server.module.GuiceBundleLoader;
 
@@ -80,8 +80,8 @@ class ServerApplication extends Application {
 environment.servlets().addFilter(SimpleCORSFiler.class.getName(), new 
SimpleCORSFiler())
 .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), 
true, "/*");
 
-// add authentication filters
-new AuthenticationRegister<>(configuration, environment, 
User.class).register();
+// register authentication provider
+environment.jersey().register(new 
BasicAuthProviderBuilder(configuration.getAuth(), environment).build());
 
 // context listener
 environment.servlets().addServletListeners(new CoordinatorListener());

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/b103e201/eagle-server/src/main/java/org/apache/eagle/server/authentication/AuthenticationMode.java
--
diff --git 
a/eagle-server/src/main/java/org/apache/eagle/server/authentication/AuthenticationMode.java
 
b/eagle-server/src/main/java/org/apache/eagle/server/authentication/AuthenticationMode.java
deleted file mode 100644
index 8a7208f..000
--- 
a/eagle-server/src/main/java/org/apache/eagle/server/authentication/AuthenticationMode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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

incubator-eagle git commit: [EAGLE-625] remove site ignore

2016-10-16 Thread jilin 
Repository: incubator-eagle
Updated Branches:
  refs/heads/master 97edbbbe3 -> 33b972065


[EAGLE-625] remove site ignore

Root `.gitignore` prevent the site folder which ignore the web page site folder.

Author: zombieJ 

Closes #516 from zombieJ/EAGLE-625.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/33b97206
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/33b97206
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/33b97206

Branch: refs/heads/master
Commit: 33b9720656b8cd7ec5df883b79b20bccd5bddb3e
Parents: 97edbbb
Author: zombieJ 
Authored: Mon Oct 17 10:28:26 2016 +0800
Committer: zombieJ 
Committed: Mon Oct 17 10:28:26 2016 +0800

--
 .gitignore  |  1 -
 .../main/webapp/app/dev/partials/site/home.html | 36 
 2 files changed, 36 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/33b97206/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 3a925f3..cfff821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,5 +83,4 @@ logs/
 *.orig
 **/*.pyc
 
-site/
 **/*.db
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/33b97206/eagle-server/src/main/webapp/app/dev/partials/site/home.html
--
diff --git a/eagle-server/src/main/webapp/app/dev/partials/site/home.html 
b/eagle-server/src/main/webapp/app/dev/partials/site/home.html
new file mode 100644
index 000..217db56
--- /dev/null
+++ b/eagle-server/src/main/webapp/app/dev/partials/site/home.html
@@ -0,0 +1,36 @@
+
+
+
+   
+   
+   
+
+   
+   
+   
+   No Widget
+
+   No widget provided by Application
+   
+   
+   
+   
+   
+   
+

incubator-eagle git commit: [EAGLE-624][UI] Improve ui information and fix bugs

2016-10-16 Thread hao 
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 @@
 
 
 
+
+Perquisites
+
+Require permission to READ/WRITE/CREATE on kafka 
topic
+
+Usage Steps
+
+Configure kafka connection in settings
+Install and start alert engine
+Integrate streams and define policy
+
+
 
 
+
+After uninstalled
+
+Clean up kafka topics automatically created by alert 
engine
+
+
 
 
 

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