You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/13 12:50:16 UTC
[49/50] incubator-lens git commit: Remove the usage of inmobi and
grill
Remove the usage of inmobi and grill
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/a47ecd5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/a47ecd5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/a47ecd5f
Branch: refs/heads/toapache
Commit: a47ecd5f29013535487fc21ca7d424b436a1f8ae
Parents: ea0bfc2
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Thu Nov 13 17:04:50 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Thu Nov 13 17:04:50 2014 +0530
----------------------------------------------------------------------
README.md | 2 +-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client-dist/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
.../apache/lens/cube/parse/TestTimeRangeExtractor.java | 1 -
lens-dist/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-impala/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
.../main/java/org/apache/lens/api/ml/TestReport.java | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/enunciate.xml | 3 +--
lens-server/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
pom.xml | 2 +-
src/site/apt/admin/config-server.apt | 5 +++--
src/site/apt/developer/contribute.apt | 2 +-
src/site/apt/gettingstarted/install-steps.apt | 2 +-
src/site/apt/user/jdbc-client.apt | 2 +-
src/site/site.xml | 12 +++++-------
tools/scripts/generate-site-public.sh | 2 +-
26 files changed, 31 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1a92565..07a3249 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,4 @@ Lens
Lens is a unified Analytics Platform
-[Detailed documentation for the project is available here](https://inmobi.github.io/grill)
+[Detailed documentation for the project is available here](https://lens.incubator.apache.org)
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 34e3865..f685f1b 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 2f74a93..03b12ab 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-client-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client-dist/pom.xml b/lens-client-dist/pom.xml
index d821229..1860c83 100644
--- a/lens-client-dist/pom.xml
+++ b/lens-client-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-client-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 97c56e7..fad03fc 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index a1e6be5..2a461d1 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeExtractor.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeExtractor.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeExtractor.java
index f198249..f68715f 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeExtractor.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeExtractor.java
@@ -75,7 +75,6 @@ public class TestTimeRangeExtractor extends TestQueryRewrite {
@Test
public void testNoNPE() throws Exception {
- // GRILL-38 NPE in extracting time range
String timeRange = " time_range_in(dt, '" + dateTwoDaysBack + "','" + dateNow + "')";
String q1 = "SELECT cityid, testCube.msr2 from testCube where " + timeRange + " AND cityid IS NULL";
rewrite(driver, q1);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 987839d..4ea53fe 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 5d300c2..f030251 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-driver-impala/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-impala/pom.xml b/lens-driver-impala/pom.xml
index 21f56f5..aaeb08b 100644
--- a/lens-driver-impala/pom.xml
+++ b/lens-driver-impala/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-impala</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 44f43d6..c0d827d 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index daaa04d..c3362c1 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 028b3cd..f9e7e0f 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-ml-lib/src/main/java/org/apache/lens/api/ml/TestReport.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/api/ml/TestReport.java b/lens-ml-lib/src/main/java/org/apache/lens/api/ml/TestReport.java
index 90a71b5..4c0bf51 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/api/ml/TestReport.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/api/ml/TestReport.java
@@ -115,7 +115,7 @@ public class TestReport {
builder.append("Algorithm: ").append(algorithm).append('\n');
builder.append("Report id: ").append(reportID).append('\n');
builder.append("Model id: ").append(modelID).append('\n');
- builder.append("Grill Query id: ").append(queryID).append('\n');
+ builder.append("Lens Query id: ").append(queryID).append('\n');
builder.append("Feature columns: ").append(featureColumns).append('\n');
builder.append("Labelled column: ").append(labelColumn).append('\n');
builder.append("Predicted column: ").append(outputColumn).append('\n');
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 86ab4cd..3ca9c3c 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index f03cfd6..5ff2837 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-server/enunciate.xml
----------------------------------------------------------------------
diff --git a/lens-server/enunciate.xml b/lens-server/enunciate.xml
index f727671..b4fafae 100644
--- a/lens-server/enunciate.xml
+++ b/lens-server/enunciate.xml
@@ -21,9 +21,8 @@
-->
<enunciate label="lens" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.25.xsd">
- <deployment protocol="https" host="github.com" context="/pages/InMobi/lens/wsdocs"/>
<namespaces>
- <namespace uri="http://github.com/InMobi/grill" id="grill"/>
+ <namespace uri="https://git-wip-us.apache.org/repos/asf?p=incubator-lens.git" id="lens"/>
</namespaces>
<services>
<rest defaultRestSubcontext="/">
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 42192d9..9a8fb7d 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index bc0ee3f..80a640b 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-parent</artifactId>
<groupId>org.apache.lens</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e8beee3..42f0df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>lens-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/src/site/apt/admin/config-server.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/config-server.apt b/src/site/apt/admin/config-server.apt
index eb45b04..9349bfc 100644
--- a/src/site/apt/admin/config-server.apt
+++ b/src/site/apt/admin/config-server.apt
@@ -34,9 +34,10 @@ Configuring lens server
The supported drivers are configured through classnames in this release. The configuration
for each driver can be specified in their site.xml file. For example, HiveDriver's
configuration should be specified in hive-site.xml. Supported drivers in this version
- are com.inmobi.lens.driver.hive.HiveDriver and com.inmobi.lens.driver.jdbc.JDBCDriver.
+ are org.apache.lens.driver.hive.HiveDriver and org.apache.lens.driver.jdbc.JDBCDriver.
The configuration parameters and
- their detailed description and default values for HiveDriver are available {{{./hivedriver-config.html} here}}
+ their detailed description and default values for HiveDriver
+ are available {{{./hivedriver-config.html} here}}
and for JDBCDriver available {{{./jdbcdriver-config.html} here}}.
The overridden configuration for HiveDriver and JDBCDriver can be part of hivedriver-site.xml
and jdbc-driver-site.xml respectively.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index e1c5450..dcf033c 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -29,7 +29,7 @@ Developer Documentation : How to contribute to Apache Lens?
** Source Repository
Lens uses {{{http://git-scm.com/} git}} for its code repository. The repository is available at
- {{{https://github.com/InMobi/grill} https://github.com/InMobi/grill}}.
+ {{{https://git-wip-us.apache.org/repos/asf?p=incubator-lens.git} https://git-wip-us.apache.org/repos/asf?p=incubator-lens.git}}.
** Build tools
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/src/site/apt/gettingstarted/install-steps.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/gettingstarted/install-steps.apt b/src/site/apt/gettingstarted/install-steps.apt
index e4d860f..9560e0c 100644
--- a/src/site/apt/gettingstarted/install-steps.apt
+++ b/src/site/apt/gettingstarted/install-steps.apt
@@ -27,7 +27,7 @@ Installing and running lens
+---+
- git clone https://github.com/InMobi/grill
+ git clone https://git-wip-us.apache.org/repos/asf?p=incubator-lens.git
cd lens
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/src/site/apt/user/jdbc-client.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user/jdbc-client.apt b/src/site/apt/user/jdbc-client.apt
index 58b418e..9ac3577 100644
--- a/src/site/apt/user/jdbc-client.apt
+++ b/src/site/apt/user/jdbc-client.apt
@@ -24,7 +24,7 @@ JDBC Client
<<Using JDBC driver.>>
- The main driver class for accessing lens server is <<<com.inmobi.lens.client.jdbc.LensJdbcDriver.java>>>
+ The main driver class for accessing lens server is <<<org.apache.lens.client.jdbc.LensJdbcDriver.java>>>
Add <<<lens-client-site.xml>>> in the class path and configure following parameters as described in {{{./client-config.html}here}}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 5d90886..76c83ef 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,10 +25,9 @@
<publishDate position="right"/>
<version position="right"/>
<bannerLeft>
- <name>Lens Analytics Platform for InMobi</name>
+ <name>Lens Analytics Platform</name>
<title>Lens Analytics Platform</title>
- <src>http://inmobi.github.io/grill/grill-logo.png</src>
- <href>http://inmobi.github.io/grill</href>
+ <href>http://lens.incubator.apache.org</href>
</bannerLeft>
<body>
@@ -60,8 +59,8 @@
</menu>
<menu ref="reports"/>
<breadcrumbs>
- <item name="InMobi" href="https://github.com/InMobi" />
- <item name="Lens" href="https://github.com/InMobi/grill" />
+ <item name="ASF" href="http://www.apache.org" />
+ <item name="Lens" href="http://lens.incubator.apache.org" />
</breadcrumbs>
</body>
<skin>
@@ -70,7 +69,6 @@
<version>1.1</version>
</skin>
<poweredBy>
- <logo name="inmobi" href="http://www.inmobi.com/"
- img="../images/inmobi-logo.jpg"/>
+ <logo name="ASF" href="http://www.apache.org/"/>
</poweredBy>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/a47ecd5f/tools/scripts/generate-site-public.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh
index fb09f36..afe956b 100755
--- a/tools/scripts/generate-site-public.sh
+++ b/tools/scripts/generate-site-public.sh
@@ -24,7 +24,7 @@ die() {
exit 1
}
-REPO=git@github.com:InMobi/grill.git
+REPO=https://git-wip-us.apache.org/repos/asf?p=incubator-lens.git
TMP=/tmp/lens-site-stage
STAGE=`pwd`/target/staging
REST_DIR=`pwd`/lens-server/target/site/wsdocs