You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/12/14 15:39:00 UTC
kylin git commit: minor, clean up for text files and scripts
Repository: kylin
Updated Branches:
refs/heads/2.0-rc 22e439272 -> af883ef39
minor, clean up for text files and scripts
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/af883ef3
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/af883ef3
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/af883ef3
Branch: refs/heads/2.0-rc
Commit: af883ef39bf2ab4775545fd02d6b6d70e7ef4362
Parents: 22e4392
Author: lidongsjtu <do...@ebay.com>
Authored: Mon Dec 14 22:35:22 2015 +0800
Committer: lidongsjtu <do...@ebay.com>
Committed: Mon Dec 14 22:35:22 2015 +0800
----------------------------------------------------------------------
.travis.yml | 16 ++++++++++
README.md | 10 +++---
build/conf/kylin.properties | 17 +++++++++++
build/conf/kylin_hive_conf.xml | 14 +++++++++
build/conf/kylin_job_conf.xml | 14 +++++++++
dev-support/test_all_against_hdp_2_2_4_2_2.sh | 17 +++++++++++
.../test_case_data/localmeta/kylin.properties | 17 +++++++++++
.../test_case_data/sandbox/kylin.properties | 17 +++++++++++
pom.xml | 32 ++++++++++----------
webapp/app/js/controllers/cubeDimensions.js | 2 +-
webapp/app/js/controllers/cubeMeasures.js | 2 +-
.../js/directives/kylin_abn_tree_directive.js | 18 +++++++++++
12 files changed, 153 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f5c99a7..0698e08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,17 @@
+#
+# 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.
+#
language: java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 73313f5..176d89c 100644
--- a/README.md
+++ b/README.md
@@ -5,20 +5,20 @@ Apache Kylin
Apache Kylin is an open source Distributed Analytics Engine, contributed by eBay Inc., provides SQL interface and multi-dimensional analysis (OLAP) on Hadoop supporting extremely large datasets.
-For more details, see the website [http://kylin.incubator.apache.org](http://kylin.incubator.apache.org).
+For more details, see the website [http://kylin.apache.org](http://kylin.apache.org).
Documentation
=============
-Please refer to [http://kylin.incubator.apache.org/docs/](http://kylin.incubator.apache.org/docs/).
+Please refer to [http://kylin.apache.org/docs/](http://kylin.apache.org/docs/).
Get Help
============
-The fastest way to get response from our developers is to send email to our mail list <de...@kylin.incubator.apache.org>,
-and remember to subscribe our mail list via <de...@kylin.incubator.apache.org>
+The fastest way to get response from our developers is to send email to our mail list <de...@kylin.apache.org>,
+and remember to subscribe our mail list via <de...@kylin.apache.org>
Licnese
============
-Please refer to [LICENSE](https://github.com/apache/incubator-kylin/blob/master/LICENSE) file.
+Please refer to [LICENSE](https://github.com/apache/kylin/blob/master/LICENSE) file.
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/build/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties
index 36f34a7..2c34e92 100644
--- a/build/conf/kylin.properties
+++ b/build/conf/kylin.properties
@@ -1,3 +1,20 @@
+#
+# 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.
+#
+
## Config for Kylin Engine ##
# List of web servers in use, this enables one web server instance to sync up with other servers.
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/build/conf/kylin_hive_conf.xml
----------------------------------------------------------------------
diff --git a/build/conf/kylin_hive_conf.xml b/build/conf/kylin_hive_conf.xml
index afa53f7..3fe17b6 100644
--- a/build/conf/kylin_hive_conf.xml
+++ b/build/conf/kylin_hive_conf.xml
@@ -1,4 +1,18 @@
<?xml version="1.0"?>
+<!--
+Licensed 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. See accompanying LICENSE file.
+-->
+
<configuration>
<property>
<name>dfs.replication</name>
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/build/conf/kylin_job_conf.xml
----------------------------------------------------------------------
diff --git a/build/conf/kylin_job_conf.xml b/build/conf/kylin_job_conf.xml
index b018645..dde111a 100644
--- a/build/conf/kylin_job_conf.xml
+++ b/build/conf/kylin_job_conf.xml
@@ -1,4 +1,18 @@
<?xml version="1.0"?>
+<!--
+Licensed 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. See accompanying LICENSE file.
+-->
+
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/dev-support/test_all_against_hdp_2_2_4_2_2.sh
----------------------------------------------------------------------
diff --git a/dev-support/test_all_against_hdp_2_2_4_2_2.sh b/dev-support/test_all_against_hdp_2_2_4_2_2.sh
index 1f63f71..e07facb 100644
--- a/dev-support/test_all_against_hdp_2_2_4_2_2.sh
+++ b/dev-support/test_all_against_hdp_2_2_4_2_2.sh
@@ -1,5 +1,22 @@
#!/bin/bash
+#
+# 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.
+#
+
dir=$(dirname ${0})
cd ${dir}
cd ..
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties
index a008494..08b351a 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -1,3 +1,20 @@
+#
+# 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.
+#
+
## Config for Kylin Engine ##
# List of web servers in use, this enables one web server instance to sync up with other servers.
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index a12bc40..d5446b5 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -1,3 +1,20 @@
+#
+# 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.
+#
+
## Config for Kylin Engine ##
# List of web servers in use, this enables one web server instance to sync up with other servers.
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b91b8d9..c3c43f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<version>2.0-incubating-SNAPSHOT</version>
<name>Kylin:HadoopOLAPEngine</name>
- <url>http://kylin.incubator.apache.org</url>
+ <url>http://kylin.apache.org</url>
<inceptionYear>2014</inceptionYear>
@@ -134,38 +134,38 @@
<mailingLists>
<mailingList>
<name>kylin-user</name>
- <subscribe>user-subscribe@kylin.incubator.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@kylin.incubator.apache.org</unsubscribe>
- <post>user@kylin.incubator.apache.org</post>
+ <subscribe>user-subscribe@kylin.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@kylin.apache.org</unsubscribe>
+ <post>user@kylin.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/kylin-user/</archive>
</mailingList>
<mailingList>
<name>kylin-dev</name>
- <subscribe>dev-subscribe@kylin.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@kylin.incubator.apache.org</unsubscribe>
- <post>dev@kylin.incubator.apache.org</post>
+ <subscribe>dev-subscribe@kylin.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@kylin.apache.org</unsubscribe>
+ <post>dev@kylin.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/kylin-dev/</archive>
</mailingList>
<mailingList>
<name>kylin-issues</name>
- <subscribe>issues-subscribe@kylin.incubator.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@kylin.incubator.apache.org</unsubscribe>
- <post>issues@kylin.incubator.apache.org</post>
+ <subscribe>issues-subscribe@kylin.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@kylin.apache.org</unsubscribe>
+ <post>issues@kylin.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/kylin-issues/</archive>
</mailingList>
<mailingList>
<name>kylin-commits</name>
- <subscribe>commits-subscribe@kylin.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@kylin.incubator.apache.org</unsubscribe>
- <post>commits@kylin.incubator.apache.org</post>
+ <subscribe>commits-subscribe@kylin.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@kylin.apache.org</unsubscribe>
+ <post>commits@kylin.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/kylin-commits/</archive>
</mailingList>
</mailingLists>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf/incubator-kylin.git</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/kylin.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/kylin.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/kylin.git</url>
<tag>apache-kylin-2.0-incubating</tag>
</scm>
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/webapp/app/js/controllers/cubeDimensions.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeDimensions.js b/webapp/app/js/controllers/cubeDimensions.js
index 423445b..be6acd8 100644
--- a/webapp/app/js/controllers/cubeDimensions.js
+++ b/webapp/app/js/controllers/cubeDimensions.js
@@ -7,7 +7,7 @@
* "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/license$s/LICENSE-2.0
+ * 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,
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/webapp/app/js/controllers/cubeMeasures.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index 1560d23..ef76657 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -7,7 +7,7 @@
* "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/license$s/LICENSE-2.0
+ * 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,
http://git-wip-us.apache.org/repos/asf/kylin/blob/af883ef3/webapp/app/js/directives/kylin_abn_tree_directive.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/kylin_abn_tree_directive.js b/webapp/app/js/directives/kylin_abn_tree_directive.js
index 4625098..4ab76ec 100644
--- a/webapp/app/js/directives/kylin_abn_tree_directive.js
+++ b/webapp/app/js/directives/kylin_abn_tree_directive.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
(function() {
var module,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };