You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 06:23:33 UTC
[1/6] incubator-kylin git commit: KYLIN-999 fix for google fonts
license
Repository: incubator-kylin
Updated Branches:
refs/heads/2.x-staging b74a83bb2 -> ca4426c2b
KYLIN-999 fix for google fonts license
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/e0faca78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e0faca78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e0faca78
Branch: refs/heads/2.x-staging
Commit: e0faca78d9b61855dc451885abfde5eae313f2ff
Parents: b74a83b
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 10:16:23 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 11:33:55 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
assembly/pom.xml | 2 +-
cube/pom.xml | 190 +++++++++++++++++++
invertedindex/pom.xml | 2 +-
metadata/pom.xml | 160 ++++++++++++++++
monitor/pom.xml | 152 +++++++++++++++
webapp/app/css/AdminLTE-fonts.css | 23 ---
webapp/app/css/AdminLTE.css | 4 +-
...1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin 11400 -> 0 bytes
...t5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin 11044 -> 0 bytes
10 files changed, 507 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a760ced..e3a72a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ tmp/
*.bak
*.swp
*~.nib
+*.versionsBackup
local.properties
release.properties
.loadpath
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9f17913..df4a07f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -202,4 +202,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/cube/pom.xml
----------------------------------------------------------------------
diff --git a/cube/pom.xml b/cube/pom.xml
new file mode 100644
index 0000000..e5964c4
--- /dev/null
+++ b/cube/pom.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>kylin-cube</artifactId>
+ <packaging>jar</packaging>
+ <name>Kylin:Cube</name>
+
+ <parent>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin</artifactId>
+ <version>1.1.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <!--Kylin Jar -->
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-dictionary</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>compress-lzf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.roaringbitmap</groupId>
+ <artifactId>RoaringBitmap</artifactId>
+ </dependency>
+ <!--<dependency>
+ <groupId>com.n3twork.druid</groupId>
+ <artifactId>extendedset</artifactId>
+ </dependency>-->
+
+ <!-- Env & Test -->
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mrunit</groupId>
+ <artifactId>mrunit</artifactId>
+ <classifier>hadoop2</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <scope>provided</scope>
+ <!-- version conflict with hadoop2.2 -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jar-with-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assemble.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/invertedindex/pom.xml
----------------------------------------------------------------------
diff --git a/invertedindex/pom.xml b/invertedindex/pom.xml
index 9e8f92e..78850f4 100644
--- a/invertedindex/pom.xml
+++ b/invertedindex/pom.xml
@@ -94,4 +94,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
new file mode 100644
index 0000000..52feb4b
--- /dev/null
+++ b/metadata/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>kylin-metadata</artifactId>
+ <packaging>jar</packaging>
+ <name>Kylin:Metadata</name>
+
+ <parent>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin</artifactId>
+ <version>1.1.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-common</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <!-- Env & Test -->
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ <!-- protobuf version conflict with hbase-->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.hcatalog</groupId>
+ <artifactId>hive-hcatalog-core</artifactId>
+ <version>${hive-hcatalog.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <version>${hbase-hadoop2.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/assemble.xml
+ </descriptor>
+ </descriptors>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/monitor/pom.xml b/monitor/pom.xml
new file mode 100644
index 0000000..5f81f7b
--- /dev/null
+++ b/monitor/pom.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin</artifactId>
+ <version>1.1.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>kylin-monitor</artifactId>
+ <packaging>jar</packaging>
+ <name>Kylin:Monitor</name>
+ <url>http://maven.apache.org</url>
+
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--hbase dependency-->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--hbase dependency-->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Hive dependencies -->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.kylin.monitor.Client</mainClass>
+ </manifest>
+ </archive>
+
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/webapp/app/css/AdminLTE-fonts.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE-fonts.css b/webapp/app/css/AdminLTE-fonts.css
deleted file mode 100644
index a8e0244..0000000
--- a/webapp/app/css/AdminLTE-fonts.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * AdminLTE v1.2
- * Author: AlmsaeedStudio.com
- * License: Open source - MIT
- * Please visit http://opensource.org/licenses/MIT for more information
-!*/
-
-/* latin */
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 400;
- src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(../fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-/* latin */
-@font-face {
- font-family: 'Source Sans Pro';
- font-style: normal;
- font-weight: 700;
- src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index 46f397a..4254ab8 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -21,7 +21,7 @@ body {
body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: 400;
overflow-x: hidden;
overflow-y: auto;
@@ -154,7 +154,7 @@ h6,
.h4,
.h5,
.h6 {
- font-family: 'Source Sans Pro', sans-serif;
+ font-family: sans-serif;
}
/* General Links */
a {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 b/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
deleted file mode 100644
index da49c62..0000000
Binary files a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e0faca78/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 b/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
deleted file mode 100644
index 2486c1d..0000000
Binary files a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 and /dev/null differ
[2/6] incubator-kylin git commit: KYLIN-999 fix for google fonts
license and cleanup files
Posted by sh...@apache.org.
KYLIN-999 fix for google fonts license and cleanup files
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/56a5db76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/56a5db76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/56a5db76
Branch: refs/heads/2.x-staging
Commit: 56a5db764324b41f8fc2a526815fe233e6e74ebb
Parents: e0faca7
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 10:16:23 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 11:33:56 2015 +0800
----------------------------------------------------------------------
webapp/app/.gitignore | 0
webapp/app/image/Himg.png | Bin 913426 -> 0 bytes
webapp/app/image/forkme_right_red.png | Bin 7927 -> 0 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/56a5db76/webapp/app/.gitignore
----------------------------------------------------------------------
diff --git a/webapp/app/.gitignore b/webapp/app/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/56a5db76/webapp/app/image/Himg.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/Himg.png b/webapp/app/image/Himg.png
deleted file mode 100644
index 9b34a77..0000000
Binary files a/webapp/app/image/Himg.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/56a5db76/webapp/app/image/forkme_right_red.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/forkme_right_red.png b/webapp/app/image/forkme_right_red.png
deleted file mode 100644
index 1e19c21..0000000
Binary files a/webapp/app/image/forkme_right_red.png and /dev/null differ
[6/6] incubator-kylin git commit: update pom.xml with rat exclude
Posted by sh...@apache.org.
update pom.xml with rat exclude
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ca4426c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ca4426c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ca4426c2
Branch: refs/heads/2.x-staging
Commit: ca4426c2ba11ccd5f9051891faa88abcf0c44b9f
Parents: 1d9f50c
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 15:58:26 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 13:21:19 2015 +0800
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ca4426c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aac3b86..3c696f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -813,6 +813,12 @@
<!-- MIT license -->
<exclude>webapp/app/css/AdminLTE.css</exclude>
+
+ <!--configuration file -->
+ <exclude>webapp/app/routes.json</exclude>
+ <exclude>webapp/bower.json</exclude>
+ <exclude>webapp/grunt.json</exclude>
+ <exclude>webapp/package.json</exclude>
<!-- jdbc log -->
<exclude>jdbc/kylin_jdbc.log*</exclude>
[3/6] incubator-kylin git commit: update source-assembly.xml to add
zip format
Posted by sh...@apache.org.
update source-assembly.xml to add zip format
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/fd197251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/fd197251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/fd197251
Branch: refs/heads/2.x-staging
Commit: fd1972518fb66dbc110738262c9e59e7ece2a33e
Parents: 7ad648c
Author: shaofengshi <sh...@apache.org>
Authored: Wed Nov 4 14:34:47 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 11:54:26 2015 +0800
----------------------------------------------------------------------
src/main/config/assemblies/source-assembly.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/fd197251/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 96a56a1..6c349f6 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -18,6 +18,7 @@ limitations under the License.
<assembly>
<id>src</id>
<formats>
+ <format>zip</format>
<format>tar.gz</format>
</formats>
@@ -25,7 +26,7 @@ limitations under the License.
<!-- main project directory structure -->
<fileSet>
<directory>.</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
@@ -94,14 +95,14 @@ limitations under the License.
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF
</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>git.properties</include>
</includes>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
[5/6] incubator-kylin git commit: KYLIN-999 update rat rule in pom
Posted by sh...@apache.org.
KYLIN-999 update rat rule in pom
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1d9f50c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1d9f50c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1d9f50c8
Branch: refs/heads/2.x-staging
Commit: 1d9f50c83427326618c974ff3b48f67f541c20fc
Parents: fd19725
Author: Luke Han <lu...@apache.org>
Authored: Wed Nov 4 15:09:42 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 13:21:19 2015 +0800
----------------------------------------------------------------------
pom.xml | 106 +++++++++++++++++++-
src/main/config/assemblies/source-assembly.xml | 9 ++
2 files changed, 112 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d9f50c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 37b5f04..aac3b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,8 +748,108 @@
</configuration>
</plugin>
+ <!-- Apache-RAT checks for files without headers.
+ If run on a messy developer's sandbox, it will fail.
+ This serves as a reminder to only build a release in a clean
+ sandbox! -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>README.*</exclude>
+ <exclude>**/LICENSE*</exclude>
+ <!-- Local git repo -->
+ <exclude>.git/**</exclude>
+ <!-- IDE files -->
+ <exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+
+ <!-- text files without comments -->
+ <exclude>**/*.csv</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.md</exclude>
+ <!-- binary files -->
+ <exclude>**/*.dict</exclude>
+ <exclude>**/*.dic</exclude>
+ <exclude>**/*.snapshot</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- image files constitute images required for documentation. .pptx contain the sources for images -->
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.ico</exclude>
+
+ <exclude>server/logs**</exclude>
+
+ <exclude>**/.checkstyle</exclude>
+ <!--Job's Test Data-->
+ <exclude>**/src/test/resources/**</exclude>
+
+ <!-- generated files -->
+ <exclude>**/target/**</exclude>
+ <exclude>lib/**</exclude>
+ <exclude>dist/**</exclude>
+ <!-- Kylin's website content -->
+ <exclude>**/.sass-cache/**</exclude>
+
+ <exclude>website/**</exclude>
+
+ <!-- front end libary and generated files -->
+ <exclude>webapp/node_modules/**</exclude>
+ <exclude>webapp/dist/**</exclude>
+ <exclude>webapp/app/components/**</exclude>
+ <!-- json configuration file-->
+ <exclude>webapp/.bowerrc</exclude>
+ <exclude>webapp/.jshintrc</exclude>
+ <!-- generated dict files -->
+ <exclude>dictionary/metastore_db/**</exclude>
+
+ <!-- MIT license -->
+ <exclude>webapp/app/css/AdminLTE.css</exclude>
+
+ <!-- jdbc log -->
+ <exclude>jdbc/kylin_jdbc.log*</exclude>
+ <!-- server log -->
+ <exclude>server/logs/**</exclude>
+
+ <!-- HBase MiniCluster Testing Data, for testing only -->
+ <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
+ <exclude>examples/test_case_data/**/*.xml</exclude>
+
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<!-- Override the parent assembly execution to customize the assembly
- descriptor and final name. -->
+ descriptor and final name. -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -764,7 +864,7 @@
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<appendAssemblyId>true</appendAssemblyId>
<descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
- <finalName>apache-kylin-${project.version}-src</finalName>
+ <finalName>apache-kylin-${project.version}</finalName>
</configuration>
</execution>
</executions>
@@ -930,4 +1030,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d9f50c8/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 6c349f6..23a215b 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -89,6 +89,15 @@ limitations under the License.
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?dist(/.*)?]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?build(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?lib(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?docs(/.*)?]
+ </exclude>
</excludes>
</fileSet>
<!-- LICENSE, NOTICE, DEPENDENCIES, git.properties, etc. calculated at build time -->
[4/6] incubator-kylin git commit: KYLIN-999 remove ref to Admin-fonts
Posted by sh...@apache.org.
KYLIN-999 remove ref to Admin-fonts
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7ad648c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7ad648c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7ad648c7
Branch: refs/heads/2.x-staging
Commit: 7ad648c7c1998291e39828c16f6b7b3e03efac0c
Parents: 56a5db7
Author: jiazhong <ji...@ebay.com>
Authored: Wed Nov 4 11:36:47 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 11:54:26 2015 +0800
----------------------------------------------------------------------
pom.xml | 12 +++++++++---
webapp/app/index.html | 1 -
webapp/grunt.json | 1 -
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8332ee0..37b5f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<commons-collections4.version>4.0</commons-collections4.version>
<commons-email.version>1.1</commons-email.version>
<commons-math3.version>3.5</commons-math3.version>
-
+
<!-- Spark -->
<spark.version>1.3.0</spark.version>
@@ -857,6 +857,12 @@
<exclude>webapp/app/css/AdminLTE-fonts.css</exclude>
<exclude>webapp/app/css/AdminLTE.css</exclude>
+ <!--configuration file -->
+ <exclude>webapp/app/routes.json</exclude>
+ <exclude>webapp/bower.json</exclude>
+ <exclude>webapp/grunt.json</exclude>
+ <exclude>webapp/package.json</exclude>
+
<!-- jdbc log -->
<exclude>jdbc/kylin_jdbc.log*</exclude>
<!-- server log -->
@@ -865,7 +871,7 @@
<!-- HBase MiniCluster Testing Data, for testing only -->
<exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
<exclude>examples/test_case_data/**/*.xml</exclude>
-
+
<!--ODBC sub project is a VS project, exclude related files -->
<exclude>**/*.sln</exclude>
<exclude>**/*.vcxproj</exclude>
@@ -924,4 +930,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index caa8d2a..6e5d463 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -41,7 +41,6 @@
<link rel="stylesheet" type="text/css" href="components/animate.css/animate.css">
<link rel="stylesheet" type="text/css" href="components/nvd3/nv.d3.min.css">
- <link rel="stylesheet" type="text/css" href="css/AdminLTE-fonts.css">
<link rel="stylesheet" type="text/css" href="css/AdminLTE.css">
<link rel="stylesheet" type="text/css" href="components/bootstrap-sweetalert/lib/sweet-alert.css">
<link rel="stylesheet" type="text/css" href="components/angular-bootstrap-nav-tree/dist/abn_tree.css">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index 1750014..ef56991 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -49,7 +49,6 @@
"src": [
"app/components/bootstrap/dist/css/bootstrap.min.css",
"app/components/components-font-awesome/css/font-awesome.css",
- "app/css/AdminLTE-fonts.css",
"app/components/ng-grid/ng-grid.css",
"app/components/angular-tree-control/css/tree-control.css",
"app/components/angular-tree-control/css/tree-control-attribute.css",