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/12/25 02:24:42 UTC
incubator-lens git commit: LENS-3 : Update logo and images in site
(Srikanth Sundarrajan via amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master eb0de6a0f -> fb038e0bf
LENS-3 : Update logo and images in site (Srikanth Sundarrajan via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/fb038e0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/fb038e0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/fb038e0b
Branch: refs/heads/master
Commit: fb038e0bf964ec9f4b3ad973bf6e5c275df80224
Parents: eb0de6a
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Thu Dec 25 06:54:33 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Thu Dec 25 06:54:33 2014 +0530
----------------------------------------------------------------------
grill-logo.png | Bin 3557 -> 0 bytes
src/site/apt/admin/deployment.apt | 2 +-
src/site/apt/admin/server-components.apt | 2 +-
src/site/apt/developer/design.apt | 2 +-
src/site/apt/figures/arch.png | Bin 135044 -> 0 bytes
src/site/apt/figures/data-layout.png | Bin 59053 -> 0 bytes
src/site/apt/figures/deployment.png | Bin 58113 -> 0 bytes
src/site/apt/figures/query-states.png | Bin 95452 -> 0 bytes
src/site/apt/figures/querystate.png | Bin 95452 -> 0 bytes
src/site/apt/figures/server-design.png | Bin 104265 -> 0 bytes
src/site/apt/figures/serverdesign.png | Bin 104265 -> 0 bytes
src/site/apt/index.apt | 2 +-
src/site/apt/user/index.apt | 2 +-
src/site/apt/user/olap-cube.apt | 2 +-
.../resources/images/apache-incubator-logo.png | Bin 0 -> 4234 bytes
src/site/resources/images/apache-lens-logo.png | Bin 0 -> 17288 bytes
src/site/resources/images/arch.png | Bin 0 -> 135044 bytes
src/site/resources/images/data-layout.png | Bin 0 -> 59053 bytes
src/site/resources/images/deployment.png | Bin 0 -> 58113 bytes
src/site/resources/images/query-states.png | Bin 0 -> 95452 bytes
src/site/resources/images/querystate.png | Bin 0 -> 95452 bytes
src/site/resources/images/server-design.png | Bin 0 -> 104265 bytes
src/site/resources/images/serverdesign.png | Bin 0 -> 104265 bytes
src/site/site.xml | 14 +++++++++++---
tools/scripts/generate-site-public.sh | 2 --
25 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/grill-logo.png
----------------------------------------------------------------------
diff --git a/grill-logo.png b/grill-logo.png
deleted file mode 100644
index bce8971..0000000
Binary files a/grill-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/admin/deployment.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/deployment.apt b/src/site/apt/admin/deployment.apt
index 2b58e97..bbaa56c 100644
--- a/src/site/apt/admin/deployment.apt
+++ b/src/site/apt/admin/deployment.apt
@@ -28,7 +28,7 @@ Lens server deployment
Typical deployment suggested is depicted in the following diagram
-[../figures/deployment.png] Lens Server deployment
+[/images/deployment.png] Lens Server deployment
It requires HiveMetastore server, HiveServer2 and Lens Server running on different machines.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/admin/server-components.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/server-components.apt b/src/site/apt/admin/server-components.apt
index 439d98c..e718a48 100644
--- a/src/site/apt/admin/server-components.apt
+++ b/src/site/apt/admin/server-components.apt
@@ -24,7 +24,7 @@ Lens server components
Here is the diagram describing all the components:
-[../figures/serverdesign.png] Lens Server components
+[/images/serverdesign.png] Lens Server components
* Lens services
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/developer/design.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/design.apt b/src/site/apt/developer/design.apt
index 82fef7c..d370a72 100644
--- a/src/site/apt/developer/design.apt
+++ b/src/site/apt/developer/design.apt
@@ -21,4 +21,4 @@ Lens Design Docs
Following figure shows the main componenents inside a Lens server
-[../figures/serverdesign.png] Lens Server Modules
+[/images/serverdesign.png] Lens Server Modules
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/arch.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/arch.png b/src/site/apt/figures/arch.png
deleted file mode 100644
index ad706fc..0000000
Binary files a/src/site/apt/figures/arch.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/data-layout.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/data-layout.png b/src/site/apt/figures/data-layout.png
deleted file mode 100644
index 9fb43f5..0000000
Binary files a/src/site/apt/figures/data-layout.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/deployment.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/deployment.png b/src/site/apt/figures/deployment.png
deleted file mode 100644
index 2f2c914..0000000
Binary files a/src/site/apt/figures/deployment.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/query-states.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/query-states.png b/src/site/apt/figures/query-states.png
deleted file mode 100644
index 9cbe0e5..0000000
Binary files a/src/site/apt/figures/query-states.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/querystate.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/querystate.png b/src/site/apt/figures/querystate.png
deleted file mode 100644
index 9cbe0e5..0000000
Binary files a/src/site/apt/figures/querystate.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/server-design.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/server-design.png b/src/site/apt/figures/server-design.png
deleted file mode 100644
index e8b69dd..0000000
Binary files a/src/site/apt/figures/server-design.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/figures/serverdesign.png
----------------------------------------------------------------------
diff --git a/src/site/apt/figures/serverdesign.png b/src/site/apt/figures/serverdesign.png
deleted file mode 100644
index e8b69dd..0000000
Binary files a/src/site/apt/figures/serverdesign.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 49a5e2f..c079768 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -40,4 +40,4 @@ Welcome to Lens!
The following diagram shows Lens architecture.
-[./figures/arch.png] Lens Architecture
+[/images/arch.png] Lens Architecture
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/user/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user/index.apt b/src/site/apt/user/index.apt
index 53df26b..ffcc12c 100644
--- a/src/site/apt/user/index.apt
+++ b/src/site/apt/user/index.apt
@@ -120,7 +120,7 @@ Lens User Guide
The following diagram shows query state transition in the Lens Server
-[../figures/querystate.png] Query States in Lens
+[/images/querystate.png] Query States in Lens
When user submits a query to the Lens Server, its starts in the <<NEW>> state. After the query is submitted, it moves into the <<QUEUED>> state. Until Lens server is free to take up the query, it remains in the <<QUEUED>> state. As soon as Lens server starts processing the query, it enters the <<LAUNCHED>> state. At this stage Lens has decided which backend engine will be used to execute the query.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/apt/user/olap-cube.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user/olap-cube.apt b/src/site/apt/user/olap-cube.apt
index b69ab4c..824bd01 100644
--- a/src/site/apt/user/olap-cube.apt
+++ b/src/site/apt/user/olap-cube.apt
@@ -29,7 +29,7 @@ OLAP Data cube concepts
The typical data layout is depicted in the following diagram.
-[../figures/data-layout.png] Fact data and dimension data
+[/images/data-layout.png] Fact data and dimension data
Lens provides an abstraction to represent above layout, and allows user to define schema
of the data at conceptual level and also query the same, without knowing
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/apache-incubator-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-incubator-logo.png b/src/site/resources/images/apache-incubator-logo.png
new file mode 100644
index 0000000..81fb31e
Binary files /dev/null and b/src/site/resources/images/apache-incubator-logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/apache-lens-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-lens-logo.png b/src/site/resources/images/apache-lens-logo.png
new file mode 100644
index 0000000..7266dce
Binary files /dev/null and b/src/site/resources/images/apache-lens-logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/arch.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/arch.png b/src/site/resources/images/arch.png
new file mode 100644
index 0000000..ad706fc
Binary files /dev/null and b/src/site/resources/images/arch.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/data-layout.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/data-layout.png b/src/site/resources/images/data-layout.png
new file mode 100644
index 0000000..9fb43f5
Binary files /dev/null and b/src/site/resources/images/data-layout.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/deployment.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/deployment.png b/src/site/resources/images/deployment.png
new file mode 100644
index 0000000..2f2c914
Binary files /dev/null and b/src/site/resources/images/deployment.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/query-states.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/query-states.png b/src/site/resources/images/query-states.png
new file mode 100644
index 0000000..9cbe0e5
Binary files /dev/null and b/src/site/resources/images/query-states.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/querystate.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/querystate.png b/src/site/resources/images/querystate.png
new file mode 100644
index 0000000..9cbe0e5
Binary files /dev/null and b/src/site/resources/images/querystate.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/server-design.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/server-design.png b/src/site/resources/images/server-design.png
new file mode 100644
index 0000000..e8b69dd
Binary files /dev/null and b/src/site/resources/images/server-design.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/resources/images/serverdesign.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/serverdesign.png b/src/site/resources/images/serverdesign.png
new file mode 100644
index 0000000..e8b69dd
Binary files /dev/null and b/src/site/resources/images/serverdesign.png differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 74b318d..ec663e1 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,10 +26,18 @@
<version position="right"/>
<bannerLeft>
<name>Lens Analytics Platform</name>
+ <src>/images/apache-lens-logo.png</src>
<title>Lens Analytics Platform</title>
<href>http://lens.incubator.apache.org</href>
+ <height>54px</height>
</bannerLeft>
+ <bannerRight>
+ <name>Apache Incubator</name>
+ <src>/images/apache-incubator-logo.png</src>
+ <href>http://incubator.apache.org</href>
+ </bannerRight>
+
<body>
<menu name="Lens" >
<item name="Overview" href="index.html" />
@@ -60,14 +68,14 @@
</menu>
<menu ref="reports"/>
<breadcrumbs>
- <item name="ASF" href="http://www.apache.org" />
+ <item name="Apache" href="http://www.apache.org" />
<item name="Lens" href="http://lens.incubator.apache.org" />
</breadcrumbs>
</body>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-classic-skin</artifactId>
- <version>1.1</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.3.0</version>
</skin>
<poweredBy>
<logo name="ASF" href="http://www.apache.org/"/>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/fb038e0b/tools/scripts/generate-site-public.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh
index 29f4b87..ce11ed8 100755
--- a/tools/scripts/generate-site-public.sh
+++ b/tools/scripts/generate-site-public.sh
@@ -29,7 +29,6 @@ TMP=/tmp/lens-site-stage
STAGE=`pwd`/target/staging
REST_DIR=`pwd`/lens-server/target/site/wsdocs
IMAGES_DIR=`pwd`/src/site/apt/figures
-LOGO_FILE=`pwd`/grill-logo.png
VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version|grep -Ev '(^\[|Download\w+:)' || die "unable to get version")
@@ -57,7 +56,6 @@ mkdir -p versions/$VERSION || due "unable to create dir versions/$VERSION"
find current -type f -exec git rm {} \;
echo "Copying REST docs from " $REST_DIR
-cp $LOGO_FILE .
# Delete index.html from the source wsdocs as it conflitcs with maven index.html
echo "DELETE $REST_DIR/index.html"
rm $REST_DIR/index.html