You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2015/11/19 11:48:02 UTC
[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 <ha...@apache.org>
Authored: Thu Nov 19 18:45:43 2015 +0800
Committer: Hao Chen <ha...@apache.org>
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 @@
<parent>
<artifactId>eagle-security-parent</artifactId>
<groupId>eagle</groupId>
- <version>0.1.0</version>
+ <version>0.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<maven-scalatest.version>1.0</maven-scalatest.version>
<maven-tomcat7.version>2.2</maven-tomcat7.version>
<maven-apache-rat.version>0.11</maven-apache-rat.version>
+ <maven-failsafe.version>2.6</maven-failsafe.version>
<!-- Environment Versions-->
<hadoop.version>2.6.0.2.2.5.1-3</hadoop.version>
@@ -687,6 +688,19 @@
<useDefaultExcludes>true</useDefaultExcludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>