Return-Path: X-Original-To: apmail-eagle-commits-archive@minotaur.apache.org Delivered-To: apmail-eagle-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 A39B0185C8 for ; Thu, 19 Nov 2015 10:47:54 +0000 (UTC) Received: (qmail 35227 invoked by uid 500); 19 Nov 2015 10:47:54 -0000 Delivered-To: apmail-eagle-commits-archive@eagle.apache.org Received: (qmail 35203 invoked by uid 500); 19 Nov 2015 10:47:54 -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 35194 invoked by uid 99); 19 Nov 2015 10:47:54 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2015 10:47:54 +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 1350CC7519 for ; Thu, 19 Nov 2015 10:47:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7ENQ0Fy_DMHJ for ; Thu, 19 Nov 2015 10:47:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 0948525DFB for ; Thu, 19 Nov 2015 10:47:15 +0000 (UTC) Received: (qmail 32032 invoked by uid 99); 19 Nov 2015 10:47:09 -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; Thu, 19 Nov 2015 10:47:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AFB96E17D1; Thu, 19 Nov 2015 10:47:09 +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: Thu, 19 Nov 2015 10:48:02 -0000 Message-Id: <9dcd5a3a1f384bcdbbe3b3dce18e1d74@git.apache.org> In-Reply-To: <52adcae0110e43338593830e27f8f2fb@git.apache.org> References: <52adcae0110e43338593830e27f8f2fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [55/55] [abbrv] incubator-eagle git commit: [EAGLE-46] Modify LICENSE, NOTICE and DISCLAIMER. Fixed some compile bugs [EAGLE-46] Modify LICENSE, NOTICE and DISCLAIMER. Fixed some compile bugs Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/bf35ede0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/bf35ede0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/bf35ede0 Branch: refs/heads/master Commit: bf35ede03a55df9c851669e16c59049f696e0b6d Parents: 37e4429 Author: Hao Chen Authored: Thu Nov 19 18:45:43 2015 +0800 Committer: Hao Chen Committed: Thu Nov 19 18:45:43 2015 +0800 ---------------------------------------------------------------------- DISCLAIMER | 11 +++++++++++ LICENSE | 14 ++++++++++++++ NOTICE | 5 +++++ .../main/java/eagle/security/util/LogParseUtil.java | 2 +- .../eagle-security-hdfs-securitylog/pom.xml | 2 +- .../securitylog/HDFSSecurityLogKafkaDeserializer.java | 2 +- .../securitylog/HDFSSecurityLogProcessorMain.java | 8 ++++---- .../securitylog/parse/HDFSSecurityLogParser.java | 2 +- pom.xml | 14 ++++++++++++++ 9 files changed, 52 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/DISCLAIMER ---------------------------------------------------------------------- diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..a899a17 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,11 @@ +Apache Eagle is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further +review indicates that the infrastructure, communications, and decision +making process have stabilized in a manner consistent with other +successful ASF projects. + +While incubation status is not necessarily a reflection of the +completeness or stability of the code, it does indicate that the +project has yet to be fully endorsed by the ASF. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 8f71f43..588c2f9 100755 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,17 @@ See the License for the specific language governing permissions and limitations under the License. +============================================================================== +Apache Eagle (incubating) Subcomponents: + +The Apache Kylin project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +============================================================================== +For AdminLTE: +============================================================================== +This product bundles AdminLTE, which is available under a +"MIT" license. For details, see +https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..0f11b69 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Eagle (incubating) +Copyright 2015-2016 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/eagle-security/eagle-security-common/src/main/java/eagle/security/util/LogParseUtil.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-common/src/main/java/eagle/security/util/LogParseUtil.java b/eagle-security/eagle-security-common/src/main/java/eagle/security/util/LogParseUtil.java index 66a3e8f..1d59d12 100644 --- a/eagle-security/eagle-security-common/src/main/java/eagle/security/util/LogParseUtil.java +++ b/eagle-security/eagle-security-common/src/main/java/eagle/security/util/LogParseUtil.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; public class LogParseUtil { /** - * .e.g. hchen9@APD.xyz.com + * .e.g. user@APD.xyz.com */ private final static Pattern UGI_PATTERN_DEFAULT = Pattern.compile("^([\\w\\d\\-]+)@.*"); /** http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/eagle-security/eagle-security-hdfs-securitylog/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-securitylog/pom.xml b/eagle-security/eagle-security-hdfs-securitylog/pom.xml index 726dec1..64f07c8 100644 --- a/eagle-security/eagle-security-hdfs-securitylog/pom.xml +++ b/eagle-security/eagle-security-hdfs-securitylog/pom.xml @@ -23,7 +23,7 @@ eagle-security-parent eagle - 0.1.0 + 0.3.0 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogKafkaDeserializer.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogKafkaDeserializer.java b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogKafkaDeserializer.java index 8a9a8d9..2c54f9a 100644 --- a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogKafkaDeserializer.java +++ b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogKafkaDeserializer.java @@ -19,8 +19,8 @@ package eagle.security.securitylog; -import eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer; import eagle.security.securitylog.parse.HDFSSecurityLogObject; +import org.apache.eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer; import eagle.security.securitylog.parse.HDFSSecurityLogParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogProcessorMain.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogProcessorMain.java b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogProcessorMain.java index f667559..c87e1bc 100644 --- a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogProcessorMain.java +++ b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/HDFSSecurityLogProcessorMain.java @@ -22,10 +22,10 @@ package eagle.security.securitylog; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigRenderOptions; -import eagle.dataproc.impl.storm.kafka.KafkaSourcedSpoutProvider; -import eagle.dataproc.util.ConfigOptionParser; -import eagle.datastream.ExecutionEnvironmentFactory; -import eagle.datastream.StormExecutionEnvironment; +import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSourcedSpoutProvider; +import org.apache.eagle.dataproc.util.ConfigOptionParser; +import org.apache.eagle.datastream.ExecutionEnvironmentFactory; +import org.apache.eagle.datastream.StormExecutionEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/parse/HDFSSecurityLogParser.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/parse/HDFSSecurityLogParser.java b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/parse/HDFSSecurityLogParser.java index 9c91bc6..fd2fc28 100644 --- a/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/parse/HDFSSecurityLogParser.java +++ b/eagle-security/eagle-security-hdfs-securitylog/src/main/java/eagle/security/securitylog/parse/HDFSSecurityLogParser.java @@ -19,8 +19,8 @@ package eagle.security.securitylog.parse; -import eagle.common.DateTimeUtil; import eagle.security.util.LogParseUtil; +import org.apache.eagle.common.DateTimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/bf35ede0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a6b1189..1292f35 100755 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 1.0 2.2 0.11 + 2.6 2.6.0.2.2.5.1-3 @@ -687,6 +688,19 @@ true + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe.version} + + + + integration-test + verify + + + + org.apache.tomcat.maven