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 2015/04/15 21:47:40 UTC

[16/30] incubator-lens git commit: LENS-311 : Packaging and README update for source and binary distribution (amareshwari)

LENS-311 : Packaging and README update for source and binary distribution (amareshwari)

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/2e210e97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/2e210e97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/2e210e97

Branch: refs/heads/master
Commit: 2e210e97b77c7d8f4deee632975994da629e6137
Parents: 534ef2f
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Feb 19 04:16:19 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Feb 19 04:23:03 2015 +0530

----------------------------------------------------------------------
 README.md                                       | 13 +++-
 bin-dist-files/README                           | 62 +++++++++++++++++++-
 lens-api/pom.xml                                |  2 +-
 lens-cli/pom.xml                                |  2 +-
 lens-client/pom.xml                             |  2 +-
 lens-cube/pom.xml                               |  4 +-
 lens-dist/pom.xml                               | 20 +++++--
 .../src/deb/control/server-control/postinst     |  2 +-
 lens-dist/src/main/assembly/bin-dist.xml        |  2 +-
 lens-driver-hive/pom.xml                        |  2 +-
 lens-driver-jdbc/pom.xml                        |  2 +-
 lens-examples/pom.xml                           |  2 +-
 lens-ml-lib/pom.xml                             |  2 +-
 lens-query-lib/pom.xml                          |  2 +-
 lens-regression/pom.xml                         |  2 +-
 lens-server-api/pom.xml                         |  2 +-
 lens-server/pom.xml                             |  9 ++-
 lens-storage-db/pom.xml                         |  2 +-
 pom.xml                                         | 59 +++++++++++++++++--
 src/site/apt/developer/contribute.apt           | 18 ++++--
 src/site/apt/lenshome/install-and-run.apt       |  9 ++-
 src/site/apt/releases/release-history.apt       |  8 ++-
 tools/scripts/lens-cli                          |  2 +-
 23 files changed, 192 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 07a3249..31ac478 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,15 @@
-Lens
+Apache Lens
 =====
 
-Lens is a unified Analytics Platform
+Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics silos by providing a single view of data
+across multiple tiered data stores and optimal execution environment for the analytical query.
+
+Building source :
+Requires JDK(1.6+) and Apache Maven to be installed for the build.
+Please run <mvn clean package> to build the project.
+
+See [Development Environment Setup] (http://lens.incubator.apache.org/developer/contribute.html#Development_Environment_Setup)
+and [Building from source] (http://lens.incubator.apache.org/developer/contribute.html#Building_from_source) docs for
+more details.
 
 [Detailed documentation for the project is available here](https://lens.incubator.apache.org)

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/bin-dist-files/README
----------------------------------------------------------------------
diff --git a/bin-dist-files/README b/bin-dist-files/README
index 3e74fb9..6cf9ad4 100644
--- a/bin-dist-files/README
+++ b/bin-dist-files/README
@@ -1 +1,61 @@
-README for binary distribution 
+Apache Lens
+=====
+
+Apache Lens is a unified Analytics Platform. Lens aims to cut the Data Analytics silos by providing a single view of data
+across multiple tiered data stores and optimal execution environment for the analytical query.
+
+This distribution is a convenient binary distribution for users to try out server and client packages of Apache Lens.
+
+Detailed install and run steps available at http://lens.incubator.apache.org/lenshome/install-and-run.html and
+docker setup details available at http://lens.incubator.apache.org/lenshome/pseudo-distributed-setup.html
+
+Detailed documentation for the project is available at https://lens.incubator.apache.org
+
+Here are quick start steps :
+
+Before starting the server, you need to set HADOOP_HOME and HIVE_HOME environment variables. These should point to
+the Hadoop and Hive installation directories. Lens depends on a forked version of Hive which is available at
+https://github.com/inmobi/hive. So, Hive needs to be built and HIVE_HOME should be set as packaged directory from
+build.
+
+Building hive :
+$ git clone https://github.com/inmobi/hive
+$ git checkout hive-release-0.13.3-inm
+$ mvn clean package -DskipTests -Phadoop-2,dist
+
+Server packaging is server/ folder.
+$ cd server
+
+Starting lens server :
+bin/lens-ctl start
+
+Lens server also comes with simple UI service which can be used to browse catalog and submit queries. Once the server
+starts up, you can open the UI service on http://<serverhost>:19999/index.html and browse.
+
+Client distribution is in client/ folder.
+
+$ cd client
+
+Running examples :
+$ bin/run-examples sample-metastore
+$ bin/run-examples populate-metastore
+$ bin/run-examples runqueries
+
+Starting lens cli :
+bin/lens-cli.sh
+
+Stopping Lens server :
+bin/lens-ctl stop
+
+------
+
+LICENSE files included in the distribution are to be in compliance with bundled dependent jars. All the jars
+bundled are in compliance with Apache license. Most of the jars are available in dual license of which at least
+one license is in compliance with Apache license. The license of all the bundled jars are summarized at
+https://cwiki.apache.org/confluence/display/LENS/Licensing+in+Apache+Lens
+
+NOTE:
+Binary distribution of the release does not include dependency org.acplt:oncrpc:jar:1.0.7, as its licensing is
+not in compliance with Apache licensing. It would be required for ganglia metrics reporting. If user is
+interested in ganglia metrics reporting, the jar needs to be downloaded and used.
+

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 81ae369..4bfc007 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Lens API</name>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 72f8712..c4a2ef8 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens CLI</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index eb3d4da..a0f40ab 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -23,7 +23,7 @@
   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>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 9742a70..51eadba 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens Cube</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>
@@ -105,4 +105,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index eef8436..d132bf5 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens Distribution</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>
@@ -169,7 +169,7 @@
               <deb>${project.build.directory}/lens-server_${project.version}.deb</deb>
               <dataSet>
                 <data>
-                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server</src>
+                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/server</src>
                   <type>directory</type>
                   <mapper>
                     <type>perm</type>
@@ -177,7 +177,7 @@
                   </mapper>
                 </data>
                 <data>
-                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/server/bin</src>
+                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/server/bin</src>
                   <type>directory</type>
                   <mapper>
                     <type>perm</type>
@@ -200,7 +200,7 @@
               <deb>${project.build.directory}/lens-client_${project.version}.deb</deb>
               <dataSet>
                 <data>
-                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client</src>
+                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client</src>
                   <type>directory</type>
                   <mapper>
                     <type>perm</type>
@@ -208,7 +208,7 @@
                   </mapper>
                 </data>
                 <data>
-                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}/client/bin</src>
+                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client/bin</src>
                   <type>directory</type>
                   <mapper>
                     <type>perm</type>
@@ -216,6 +216,16 @@
                     <filemode>755</filemode>
                   </mapper>
                 </data>
+                <data>
+                  <src>target/apache-lens-${project.version}-bin/apache-lens-${project.version}-bin/client/bin/lens-cli
+                  </src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/bin/</prefix>
+                    <filemode>755</filemode>
+                  </mapper>
+                </data>
               </dataSet>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-dist/src/deb/control/server-control/postinst
----------------------------------------------------------------------
diff --git a/lens-dist/src/deb/control/server-control/postinst b/lens-dist/src/deb/control/server-control/postinst
index 0cd9d57..5d1f976 100644
--- a/lens-dist/src/deb/control/server-control/postinst
+++ b/lens-dist/src/deb/control/server-control/postinst
@@ -47,7 +47,7 @@ manage_war_expansion () {
         return 1
     fi
 
-    cd -
+    cd $OLDPWD
     if [ $? -ne 0 ]; then
         echo "Could not move back from the changed directory"
         return 1

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-dist/src/main/assembly/bin-dist.xml
----------------------------------------------------------------------
diff --git a/lens-dist/src/main/assembly/bin-dist.xml b/lens-dist/src/main/assembly/bin-dist.xml
index 4ec2d55..3554425 100644
--- a/lens-dist/src/main/assembly/bin-dist.xml
+++ b/lens-dist/src/main/assembly/bin-dist.xml
@@ -28,7 +28,7 @@
     <format>tar.gz</format>
   </formats>
 
-  <baseDirectory>apache-lens-${project.version}</baseDirectory>
+  <baseDirectory>apache-lens-${project.version}-bin</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
 
   <dependencySets>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index dccb974..5a948a8 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens Hive Driver</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 9f4078a..9872130 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Lens Driver for JDBC</name>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 8458826..2fac616 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Lens Examples</name>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index df1dac2..82dc372 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens ML Lib</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 1d93b8d..c4b9885 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens Query Library</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 92ae2f0..1fa6b84 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <name>Lens Regression</name>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 392517a..59b546a 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -23,7 +23,7 @@
   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>
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index b0b5305..608fad4 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens Server</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>
@@ -224,6 +224,13 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <attachClasses>true</attachClasses>
+          <archive>
+            <addMavenDescriptor>true</addMavenDescriptor>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 0e40e11..560c15a 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -25,7 +25,7 @@
   <name>Lens DB storage</name>
 
   <parent>
-    <artifactId>lens-parent</artifactId>
+    <artifactId>apache-lens</artifactId>
     <groupId>org.apache.lens</groupId>
     <version>2.0.0-incubating-SNAPSHOT</version>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a245f19..c499c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,14 +102,13 @@
 
     <!-- installation -->
     <mvn.lens.install.dir>/usr/local/lens</mvn.lens.install.dir>
-    <mvn.lens.bin.dir>${mvn.lens.install.dir}/bin</mvn.lens.bin.dir>
-    <mvn.lens.webapp.dir>${mvn.lens.install.dir}/webapp</mvn.lens.webapp.dir>
+    <mvn.lens.webapp.dir>${mvn.lens.install.dir}/server/webapp</mvn.lens.webapp.dir>
     <mvn.lens.server.dir>${mvn.lens.webapp.dir}/lens-server</mvn.lens.server.dir>
 
   </properties>
 
   <groupId>org.apache.lens</groupId>
-  <artifactId>lens-parent</artifactId>
+  <artifactId>apache-lens</artifactId>
   <version>2.0.0-incubating-SNAPSHOT</version>
   <name>Lens</name>
   <packaging>pom</packaging>
@@ -1049,7 +1048,57 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>no-checkstyle</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.lens</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>${lens.checkstyle.version}</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>checkstyle-check</id>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <consoleOutput>true</consoleOutput>
+                  <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                  <configLocation>checkstyle.xml</configLocation>
+                  <headerLocation>checkstyle-java-header.txt</headerLocation>
+                  <failOnViolation>false</failOnViolation>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>apache-release</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.codahale.metrics</groupId>
+            <artifactId>metrics-ganglia</artifactId>
+            <version>${metrics.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.acplt</groupId>
+                <artifactId>oncrpc</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
-
-
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt b/src/site/apt/developer/contribute.apt
index 91e7b81..c8885d6 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -110,11 +110,20 @@ Developer Documentation : How to contribute to Apache Lens?
    mvn clean package -DskipTests
 +---+
 
-  Once one of the above sets of commands completes successfully, the build will produce <lens-dist/target/lens-dist-version-bin/server> and <lens-dist/target/lens-dist-version-bin/client>. Former can be used as the Lens server installation directory and later can be used as Lens client installation directory to {{{/lenshome/install-and-run.html#Running_Lens} run}} lens server and lens client.
+  Once one of the above sets of commands completes successfully, the build will produce
+  <lens-dist/target/apache-lens-<version>-bin/apache-lens-<version>-bin/server> and
+  <lens-dist/target/apache-lens-<version>-bin/apache-lens-<version>-bin/client>. Former can be used as the Lens server
+   installation directory and later can be used as Lens client installation directory to
+   {{{/lenshome/install-and-run.html#Running_Lens} run}} lens server and lens client.
 
-  The build will also produce debians for both client and server in <lens-dist/target>. Client debian uses </usr/local/lens-client> as the Lens client installation directory and Server debian uses </usr/local/lens> as the Lens server installation directory.
+  The build will also produce debians for both client and server in <lens-dist/target>. Client debian uses
+  </usr/local/lens/client> as the Lens client installation directory and Server debian uses </usr/local/lens/server> as
+  the Lens server installation directory.
 
-  Apache Lens depends on Hive. Please {{{#Building_Hive_from_Source} build}} Hive from Source or install it using the documentation {{{/lenshome/install-and-run.html#Installing_Hive} here}}. After installing Lens and Hive, refer {{{/lenshome/install-and-run.html#Running_Lens} here}} for running lens client and lens server from installation directories.
+  Apache Lens depends on Hive. Please {{{#Building_Hive_from_Source} build}} Hive from Source or install it using the
+  documentation {{{/lenshome/install-and-run.html#Installing_Hive} here}}. After installing Lens and Hive,
+  refer {{{/lenshome/install-and-run.html#Running_Lens} here}} for running lens client and lens server from
+  installation directories.
 
 ** Building Hive from Source
 
@@ -130,7 +139,8 @@ Developer Documentation : How to contribute to Apache Lens?
 
 +---+
 
-  Once above package command completes successfully, <packaging/target> will have <apache-hive-$project.version-bin>. This build also produces source, binary tar.gz files and deb package for hive.
+  Once above package command completes successfully, <packaging/target> will have <apache-hive-$project.version-bin>.
+  This build also produces source, binary tar.gz files and deb package for hive.
 
   Set the environment variable HIVE_HOME to point to the Hive installation directory built from source:
 

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/lenshome/install-and-run.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/install-and-run.apt b/src/site/apt/lenshome/install-and-run.apt
index 6031cf9..8016491 100644
--- a/src/site/apt/lenshome/install-and-run.apt
+++ b/src/site/apt/lenshome/install-and-run.apt
@@ -38,10 +38,10 @@ Installing and Running Lens
 
 +---+
 
-  This will result in the creation of a directory named apache-lens-<verison> (where <version> is the release number).
+  This will result in the creation of a directory named apache-lens-<verison>-bin (where <version> is the release number).
 
 +---+
-  apache-lens-<verison>
+  apache-lens-<verison>-bin
   ├── client
   ├── LICENSE
   ├── NOTICE
@@ -51,7 +51,7 @@ Installing and Running Lens
   └── server
 +---+
 
- <apache-lens-<verison>/client> can be used as the Lens client installation directory and <apache-lens-<verison>/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
+ <apache-lens-<verison>-bin/client> can be used as the Lens client installation directory and <apache-lens-<verison>-bin/server> can be used as the Lens server installation directory to {{{#Running_Lens}run}} lens client and lens server respectively.
 
 ** Installing Hive
 
@@ -147,6 +147,9 @@ Installing and Running Lens
 
   You can try out examples described below or use the REST api <link> for each service.
 
+  Lens server also comes with simple UI service which can be used to browse catalog and submit queries. Once the server
+  starts up, you can open the UI service on http://<serverhost>:19999/index.html and browse.
+
   The command to stop the server:
 
 +---+

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index f5f6139..cf25530 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -24,4 +24,10 @@ All Apache Lens releases
 |Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
 *--+--+---+--+--+--+--+
 |2.0.0| First release in Apache| {{{../versions/2.0.0-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-incubating/} Download}} | - | - |
-*--+--+---+--+--+--+--+
\ No newline at end of file
+*--+--+---+--+--+--+--+
+
+* NOTES
+
+  Binary distribution of the release does not include dependency org.acplt:oncrpc:jar:1.0.7, as its licensing (LGPL) is
+  not in compliance with Apache licensing which is required for ganglia metrics reporting. If user is interested in
+  ganglia metrics reporting, the jar needs to be downloaded and used.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/2e210e97/tools/scripts/lens-cli
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-cli b/tools/scripts/lens-cli
index 66106c1..18695ef 100644
--- a/tools/scripts/lens-cli
+++ b/tools/scripts/lens-cli
@@ -19,4 +19,4 @@
 # under the License.
 #
 
-exec /usr/local/lens-client/bin/lens-cli.sh "$@"
+exec /usr/local/lens/client/bin/lens-cli.sh "$@"