You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by sh...@apache.org on 2014/12/24 03:48:09 UTC
incubator-lens git commit: LENS-146 : Separate client and server conf
for docker to fix classnotfound (sharad)
Repository: incubator-lens
Updated Branches:
refs/heads/master 15f66c36d -> b34df6920
LENS-146 : Separate client and server conf for docker to fix classnotfound (sharad)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/b34df692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/b34df692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/b34df692
Branch: refs/heads/master
Commit: b34df69207da096e00b6c91ca1016829e5aa3dfc
Parents: 15f66c3
Author: Sharad Agarwal <sh...@C02MG9LDFH00.local>
Authored: Wed Dec 24 08:19:52 2014 +0530
Committer: Sharad Agarwal <sh...@C02MG9LDFH00.local>
Committed: Wed Dec 24 08:19:52 2014 +0530
----------------------------------------------------------------------
.../src/main/assembly/client-dist.xml | 17 +++-
lens-dist/src/main/assembly/server-dist.xml | 16 ++++
lens-docker/lens-test/Dockerfile | 4 +-
lens-docker/lens-test/conf/hivedriver-site.xml | 40 ---------
lens-docker/lens-test/conf/jdbcdriver-site.xml | 49 -----------
lens-docker/lens-test/conf/lens-env.sh | 54 -------------
lens-docker/lens-test/conf/lens-site.xml | 36 ---------
lens-docker/lens-test/conf/log4j.properties | 85 --------------------
lens-docker/lens-test/lens-bootstrap.sh | 10 ++-
.../client/lens-client-site.xml | 27 +++++++
tools/conf-pseudo-distr/client/log4j.properties | 40 +++++++++
tools/conf-pseudo-distr/lens-env.sh | 54 +++++++++++++
.../server/hivedriver-site.xml | 53 ++++++++++++
.../server/jdbcdriver-site.xml | 50 ++++++++++++
tools/conf-pseudo-distr/server/lens-site.xml | 36 +++++++++
tools/conf-pseudo-distr/server/log4j.properties | 85 ++++++++++++++++++++
tools/conf/client/lens-client-site.xml | 36 ---------
17 files changed, 386 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-client-dist/src/main/assembly/client-dist.xml
----------------------------------------------------------------------
diff --git a/lens-client-dist/src/main/assembly/client-dist.xml b/lens-client-dist/src/main/assembly/client-dist.xml
index 56c4367..8190720 100644
--- a/lens-client-dist/src/main/assembly/client-dist.xml
+++ b/lens-client-dist/src/main/assembly/client-dist.xml
@@ -90,6 +90,14 @@
</fileSet>
<fileSet>
+ <directory>../tools/conf-pseudo-distr/</directory>
+ <outputDirectory>/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>../lens-examples/src/main/resources/</directory>
<outputDirectory>/examples/resources</outputDirectory>
<includes>
@@ -233,6 +241,13 @@
<include>**</include>
</includes>
</fileSet>
-
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/client</directory>
+ <outputDirectory>/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-dist/src/main/assembly/server-dist.xml
----------------------------------------------------------------------
diff --git a/lens-dist/src/main/assembly/server-dist.xml b/lens-dist/src/main/assembly/server-dist.xml
index 8977733..50122c4 100644
--- a/lens-dist/src/main/assembly/server-dist.xml
+++ b/lens-dist/src/main/assembly/server-dist.xml
@@ -87,12 +87,28 @@
</fileSet>
<fileSet>
+ <directory>../tools/conf-pseudo-distr/</directory>
+ <outputDirectory>/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>lens-env.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>../tools/conf/server</directory>
<outputDirectory>/conf/</outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>../tools/conf-pseudo-distr/server</directory>
+ <outputDirectory>/conf-pseudo-distr/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
</fileSets>
<files>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index 42d53bd..f35c0ff 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -19,10 +19,12 @@ FROM inmobi/docker-hive
ENV LENS_VERSION 2.0.0-SNAPSHOT
ENV BASEDIR /opt/lens
-ENV LENS_CONF $BASEDIR/lens-docker/lens-test/conf
ENV LENS_HOME $BASEDIR/lens-dist/target/lens-dist-${LENS_VERSION}-server/
ENV LENS_CLIENT $BASEDIR/lens-client-dist/target/lens-client-dist-${LENS_VERSION}-client/
+ENV LENS_SERVER_CONF $LENS_HOME/conf-pseudo-distr/
+ENV LENS_CLIENT_CONF $LENS_CLIENT/conf-pseudo-distr/
+
# set permissions for lens bootstrap file
ADD lens-bootstrap.sh /etc/lens-bootstrap.sh
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/conf/hivedriver-site.xml
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/conf/hivedriver-site.xml b/lens-docker/lens-test/conf/hivedriver-site.xml
deleted file mode 100644
index f179ecd..0000000
--- a/lens-docker/lens-test/conf/hivedriver-site.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
-<property>
- <name>hive.metastore.warehouse.dir</name>
- <value>/tmp/hive/warehouse</value>
-</property>
-
-<property>
- <name>hive.lock.manager</name>
- <value>org.apache.hadoop.hive.ql.lockmgr.EmbeddedLockManager</value>
-</property>
-
-<!-- Adding in supported storages by hive driver -->
-<property>
- <name>lens.cube.query.driver.supported.storages</name>
- <value>local,cluster</value>
-</property>
-</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/conf/jdbcdriver-site.xml
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/conf/jdbcdriver-site.xml b/lens-docker/lens-test/conf/jdbcdriver-site.xml
deleted file mode 100644
index 235187a..0000000
--- a/lens-docker/lens-test/conf/jdbcdriver-site.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
- <property>
- <name>lens.driver.jdbc.driver.class</name>
- <value>org.hsqldb.jdbcDriver</value>
- </property>
- <property>
- <name>lens.driver.jdbc.db.uri</name>
- <value>jdbc:hsqldb:/tmp/db-storage.db;MODE=MYSQL</value>
- </property>
- <property>
- <name>lens.driver.jdbc.db.user</name>
- <value>SA</value>
- </property>
- <property>
- <name>lens.cube.query.driver.supported.storages</name>
- <value>mydb</value>
- </property>
- <property>
- <name>lens.driver.jdbc.query.rewriter</name>
- <value>org.apache.lens.driver.jdbc.ColumnarSQLRewriter</value>
- </property>
- <property>
- <name>lens.driver.jdbc.explain.keyword</name>
- <value>explain plan for </value>
- </property>
-</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/conf/lens-env.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/conf/lens-env.sh b/lens-docker/lens-test/conf/lens-env.sh
deleted file mode 100644
index 6a6222c..0000000
--- a/lens-docker/lens-test/conf/lens-env.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# 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.
-#
-
-# The hadoop installation location.
-#export HADOOP_HOME=
-
-# The Hive installation location. Lens adds hive lib in the classpath.
-#export HIVE_HOME=
-
-# any additional java opts you want to set. This will apply to both client and server operations
-#export LENS_OPTS=
-
-# any additional java opts that you want to set for client only
-#export LENS_CLIENT_OPTS=
-
-# java heap size we want to set for the client. Default is 1024MB
-#export LENS_CLIENT_HEAP=
-
-# any additional opts you want to set for lens server.
-export LENS_SERVER_OPTS="-XX:PermSize=256m -XX:MaxPermSize=256m"
-
-# java heap size we want to set for the lens server. Default is 1024MB
-#export LENS_SERVER_HEAP=
-
-# What is is considered as lens home dir. Default is the base location of the installed software
-#export LENS_HOME_DIR=
-
-# Where log files are stored. Default is logs directory under the base install location
-#export LENS_LOG_DIR=
-
-# Where pid files are stored. Default is logs directory under the base install location
-#export LENS_PID_DIR=
-
-# Where do you want to expand the war file. By Default it is in /webapp dir under the base install dir.
-#export LENS_EXPANDED_WEBAPP_DIR=
-
-#Classpath for lens server or client
-#export LENSCPPATH=
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/conf/lens-site.xml
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/conf/lens-site.xml b/lens-docker/lens-test/conf/lens-site.xml
deleted file mode 100644
index 8110ab8..0000000
--- a/lens-docker/lens-test/conf/lens-site.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<configuration>
-
-<property>
- <name>hive.metastore.uris</name>
- <value>thrift://localhost:9083</value>
- <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
-</property>
-
-<property>
- <name>lens.server.drivers</name>
- <value>org.apache.lens.driver.hive.HiveDriver,org.apache.lens.driver.jdbc.JDBCDriver</value>
-</property>
-</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/conf/log4j.properties b/lens-docker/lens-test/conf/log4j.properties
deleted file mode 100644
index afadc2f..0000000
--- a/lens-docker/lens-test/conf/log4j.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# 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.
-#
-
-lensserver.root.logger=INFO, ROOT
-lensserver.request.logger=INFO, REQUEST
-lensserver.audit.logger=INFO, CONSOLE
-lensserver.querystatus.logger=INFO, CONSOLE
-
-log4j.rootLogger=${lensserver.root.logger}
-log4j.logger.org.apache.lens.server.LensServer.request=${lensserver.request.logger}
-log4j.additivity.org.apache.lens.server.LensServer.request=false
-log4j.logger.org.apache.lens.server.LensServer.audit=${lensserver.audit.logger}
-log4j.additivity.org.apache.lens.server.LensServer.audit=false
-log4j.logger.org.apache.lens.server.query.QueryExecutionServiceImpl$QueryStatusLogger=${lensserver.querystatus.logger}
-log4j.additivity.org.apache.lens.server.query.QueryExecutionServiceImpl$QueryStatusLogger=false
-log4j.logger.org.apache.lens.server.stats.event.query.QueryExecutionStatistics=DEBUG, QueryExecutionStatistics
-log4j.additivity.org.apache.lens.server.stats.event.query.QueryExecutionStatistics=false
-
-
-# CONSOLE is set to be a ConsoleAppender.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-# CONSOLE uses PatternLayout.
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-log4j.appender.ROOT=org.apache.log4j.RollingFileAppender
-log4j.appender.ROOT.File=${lens.log.dir}/lensserver.log
-log4j.appender.ROOT.layout=org.apache.log4j.PatternLayout
-log4j.appender.ROOT.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
-
-log4j.appender.ROOT.MaxFileSize=100000KB
-# Keep 20 backup files
-log4j.appender.ROOT.MaxBackupIndex=20
-
-
-log4j.appender.AUDIT=org.apache.log4j.RollingFileAppender
-log4j.appender.AUDIT.File=${lens.log.dir}/lensserver-audit.log
-log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout
-log4j.appender.AUDIT.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
-
-log4j.appender.AUDIT.MaxFileSize=100000KB
-# Keep 20 backup files
-log4j.appender.AUDIT.MaxBackupIndex=20
-
-log4j.appender.REQUEST=org.apache.log4j.RollingFileAppender
-log4j.appender.REQUEST.File=${lens.log.dir}/lensserver-requests.log
-log4j.appender.REQUEST.layout=org.apache.log4j.PatternLayout
-log4j.appender.REQUEST.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
-
-log4j.appender.REQUEST.MaxFileSize=100000KB
-# Keep 20 backup files
-log4j.appender.REQUEST.MaxBackupIndex=20
-
-log4j.appender.STATUS=org.apache.log4j.RollingFileAppender
-log4j.appender.STATUS.File=${lens.log.dir}/lensserver-query-status.log
-log4j.appender.STATUS.layout=org.apache.log4j.PatternLayout
-log4j.appender.STATUS.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
-
-log4j.appender.STATUS.MaxFileSize=100000KB
-# Keep 20 backup files
-log4j.appender.STATUS.MaxBackupIndex=20
-
-
-#Add query statistics logger with hourly rollup
-log4j.appender.QueryExecutionStatistics=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.QueryExecutionStatistics.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.QueryExecutionStatistics.File=${lens.log.dir}/query-stats.log
-log4j.appender.QueryExecutionStatistics.layout=org.apache.lens.server.stats.store.log.StatisticsLogLayout
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/lens-docker/lens-test/lens-bootstrap.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/lens-bootstrap.sh b/lens-docker/lens-test/lens-bootstrap.sh
index 37e725d..23ed307 100644
--- a/lens-docker/lens-test/lens-bootstrap.sh
+++ b/lens-docker/lens-test/lens-bootstrap.sh
@@ -18,7 +18,9 @@
#
echo "LENS_HOME " $LENS_HOME
+echo "LENS_SERVER_CONF " $LENS_SERVER_CONF
echo "LENS_CLIENT " $LENS_CLIENT
+echo "LENS_CLIENT_CONF " $LENS_CLIENT_CONF
#start hive bootstrap script
/etc/hive-bootstrap.sh
@@ -28,14 +30,14 @@ sleep 10
#start lens server
echo "Starting Lens server..."
-$LENS_HOME/bin/lens-ctl start
+$LENS_HOME/bin/lens-ctl start --conf $LENS_SERVER_CONF
echo "Waiting for 20 secs for Lens Server to start ..."
sleep 20
#Setting up client
-$LENS_CLIENT/bin/run-examples.sh sample-metastore
-$LENS_CLIENT/bin/run-examples.sh populate-metastore
-$LENS_CLIENT/bin/lens-cli.sh
+$LENS_CLIENT/bin/run-examples.sh sample-metastore --conf $LENS_CLIENT_CONF
+$LENS_CLIENT/bin/run-examples.sh populate-metastore --conf $LENS_CLIENT_CONF
+$LENS_CLIENT/bin/lens-cli.sh --conf $LENS_CLIENT_CONF
/bin/bash
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/client/lens-client-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/client/lens-client-site.xml b/tools/conf-pseudo-distr/client/lens-client-site.xml
new file mode 100644
index 0000000..706e356
--- /dev/null
+++ b/tools/conf-pseudo-distr/client/lens-client-site.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/client/log4j.properties
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/client/log4j.properties b/tools/conf-pseudo-distr/client/log4j.properties
new file mode 100644
index 0000000..5520304
--- /dev/null
+++ b/tools/conf-pseudo-distr/client/log4j.properties
@@ -0,0 +1,40 @@
+#
+# 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.
+#
+
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, R
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+log4j.category.org.springframework=OFF
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=${lens.log.dir}/lensclient.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+log4j.appender.R.MaxFileSize=100000KB
+# Keep 20 backup files
+log4j.appender.R.MaxBackupIndex=20
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/lens-env.sh
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/lens-env.sh b/tools/conf-pseudo-distr/lens-env.sh
new file mode 100644
index 0000000..6a6222c
--- /dev/null
+++ b/tools/conf-pseudo-distr/lens-env.sh
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+# The hadoop installation location.
+#export HADOOP_HOME=
+
+# The Hive installation location. Lens adds hive lib in the classpath.
+#export HIVE_HOME=
+
+# any additional java opts you want to set. This will apply to both client and server operations
+#export LENS_OPTS=
+
+# any additional java opts that you want to set for client only
+#export LENS_CLIENT_OPTS=
+
+# java heap size we want to set for the client. Default is 1024MB
+#export LENS_CLIENT_HEAP=
+
+# any additional opts you want to set for lens server.
+export LENS_SERVER_OPTS="-XX:PermSize=256m -XX:MaxPermSize=256m"
+
+# java heap size we want to set for the lens server. Default is 1024MB
+#export LENS_SERVER_HEAP=
+
+# What is is considered as lens home dir. Default is the base location of the installed software
+#export LENS_HOME_DIR=
+
+# Where log files are stored. Default is logs directory under the base install location
+#export LENS_LOG_DIR=
+
+# Where pid files are stored. Default is logs directory under the base install location
+#export LENS_PID_DIR=
+
+# Where do you want to expand the war file. By Default it is in /webapp dir under the base install dir.
+#export LENS_EXPANDED_WEBAPP_DIR=
+
+#Classpath for lens server or client
+#export LENSCPPATH=
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/server/hivedriver-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/hivedriver-site.xml b/tools/conf-pseudo-distr/server/hivedriver-site.xml
new file mode 100644
index 0000000..0d14777
--- /dev/null
+++ b/tools/conf-pseudo-distr/server/hivedriver-site.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+<property>
+ <name>lens.driver.hive.connection.class</name>
+ <value>org.apache.lens.driver.hive.RemoteThriftConnection</value>
+ <description>The connection class from HiveDriver to HiveServer. The default is
+ an embedded connection which does not require a remote hive server.
+ For connecting to a hiveserver end point, remote connection should be used.
+ The possible values are org.apache.lens.driver.hive.EmbeddedThriftConnection
+ and org.apache.lens.driver.hive.RemoteThriftConnection. </description>
+</property>
+
+<property>
+ <name>hive.server2.thrift.bind.host</name>
+ <value>localhost</value>
+ <description>The host on which hive server is running</description>
+</property>
+
+<property>
+ <name>hive.server2.thrift.port</name>
+ <value>10000</value>
+ <description>The port on which hive server is running</description>
+</property>
+
+<!-- Adding in supported storages by hive driver -->
+<property>
+ <name>lens.cube.query.driver.supported.storages</name>
+ <value>local,cluster</value>
+ <final>true</final>
+</property>
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/server/jdbcdriver-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/jdbcdriver-site.xml b/tools/conf-pseudo-distr/server/jdbcdriver-site.xml
new file mode 100644
index 0000000..116fddf
--- /dev/null
+++ b/tools/conf-pseudo-distr/server/jdbcdriver-site.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+ <property>
+ <name>lens.driver.jdbc.driver.class</name>
+ <value>org.hsqldb.jdbcDriver</value>
+ </property>
+ <property>
+ <name>lens.driver.jdbc.db.uri</name>
+ <value>jdbc:hsqldb:/tmp/db-storage.db;MODE=MYSQL</value>
+ </property>
+ <property>
+ <name>lens.driver.jdbc.db.user</name>
+ <value>SA</value>
+ </property>
+ <property>
+ <name>lens.cube.query.driver.supported.storages</name>
+ <value>mydb</value>
+ <final>true</final>
+ </property>
+ <property>
+ <name>lens.driver.jdbc.query.rewriter</name>
+ <value>org.apache.lens.driver.jdbc.ColumnarSQLRewriter</value>
+ </property>
+ <property>
+ <name>lens.driver.jdbc.explain.keyword</name>
+ <value>explain plan for </value>
+ </property>
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/server/lens-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/lens-site.xml b/tools/conf-pseudo-distr/server/lens-site.xml
new file mode 100644
index 0000000..8110ab8
--- /dev/null
+++ b/tools/conf-pseudo-distr/server/lens-site.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<property>
+ <name>hive.metastore.uris</name>
+ <value>thrift://localhost:9083</value>
+ <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
+</property>
+
+<property>
+ <name>lens.server.drivers</name>
+ <value>org.apache.lens.driver.hive.HiveDriver,org.apache.lens.driver.jdbc.JDBCDriver</value>
+</property>
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf-pseudo-distr/server/log4j.properties
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/log4j.properties b/tools/conf-pseudo-distr/server/log4j.properties
new file mode 100644
index 0000000..afadc2f
--- /dev/null
+++ b/tools/conf-pseudo-distr/server/log4j.properties
@@ -0,0 +1,85 @@
+#
+# 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.
+#
+
+lensserver.root.logger=INFO, ROOT
+lensserver.request.logger=INFO, REQUEST
+lensserver.audit.logger=INFO, CONSOLE
+lensserver.querystatus.logger=INFO, CONSOLE
+
+log4j.rootLogger=${lensserver.root.logger}
+log4j.logger.org.apache.lens.server.LensServer.request=${lensserver.request.logger}
+log4j.additivity.org.apache.lens.server.LensServer.request=false
+log4j.logger.org.apache.lens.server.LensServer.audit=${lensserver.audit.logger}
+log4j.additivity.org.apache.lens.server.LensServer.audit=false
+log4j.logger.org.apache.lens.server.query.QueryExecutionServiceImpl$QueryStatusLogger=${lensserver.querystatus.logger}
+log4j.additivity.org.apache.lens.server.query.QueryExecutionServiceImpl$QueryStatusLogger=false
+log4j.logger.org.apache.lens.server.stats.event.query.QueryExecutionStatistics=DEBUG, QueryExecutionStatistics
+log4j.additivity.org.apache.lens.server.stats.event.query.QueryExecutionStatistics=false
+
+
+# CONSOLE is set to be a ConsoleAppender.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+
+# CONSOLE uses PatternLayout.
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+log4j.appender.ROOT=org.apache.log4j.RollingFileAppender
+log4j.appender.ROOT.File=${lens.log.dir}/lensserver.log
+log4j.appender.ROOT.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROOT.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+log4j.appender.ROOT.MaxFileSize=100000KB
+# Keep 20 backup files
+log4j.appender.ROOT.MaxBackupIndex=20
+
+
+log4j.appender.AUDIT=org.apache.log4j.RollingFileAppender
+log4j.appender.AUDIT.File=${lens.log.dir}/lensserver-audit.log
+log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout
+log4j.appender.AUDIT.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+log4j.appender.AUDIT.MaxFileSize=100000KB
+# Keep 20 backup files
+log4j.appender.AUDIT.MaxBackupIndex=20
+
+log4j.appender.REQUEST=org.apache.log4j.RollingFileAppender
+log4j.appender.REQUEST.File=${lens.log.dir}/lensserver-requests.log
+log4j.appender.REQUEST.layout=org.apache.log4j.PatternLayout
+log4j.appender.REQUEST.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+log4j.appender.REQUEST.MaxFileSize=100000KB
+# Keep 20 backup files
+log4j.appender.REQUEST.MaxBackupIndex=20
+
+log4j.appender.STATUS=org.apache.log4j.RollingFileAppender
+log4j.appender.STATUS.File=${lens.log.dir}/lensserver-query-status.log
+log4j.appender.STATUS.layout=org.apache.log4j.PatternLayout
+log4j.appender.STATUS.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+
+log4j.appender.STATUS.MaxFileSize=100000KB
+# Keep 20 backup files
+log4j.appender.STATUS.MaxBackupIndex=20
+
+
+#Add query statistics logger with hourly rollup
+log4j.appender.QueryExecutionStatistics=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.QueryExecutionStatistics.DatePattern='.'yyyy-MM-dd-HH
+log4j.appender.QueryExecutionStatistics.File=${lens.log.dir}/query-stats.log
+log4j.appender.QueryExecutionStatistics.layout=org.apache.lens.server.stats.store.log.StatisticsLogLayout
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/b34df692/tools/conf/client/lens-client-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf/client/lens-client-site.xml b/tools/conf/client/lens-client-site.xml
index a87869e..706e356 100644
--- a/tools/conf/client/lens-client-site.xml
+++ b/tools/conf/client/lens-client-site.xml
@@ -22,42 +22,6 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
- <property>
- <name>lens.query.enable.persistent.resultset.indriver</name>
- <value>false</value>
- <description>Whether to enable persistent resultset on the driver for queries</description>
- </property>
- <property>
- <name>lens.cube.query.disable.auto.join</name>
- <value>false</value>
- <description>Tells whether to disable automatic resolution of join conditions between tables involved.
- To enable automatic resolution, this value should be false.</description>
- </property>
- <property>
- <name>lens.cube.query.disable.aggregate.resolver</name>
- <value>false</value>
- <description>Tells whether to disable automatic resolution of aggregations for measures in a cube.
- To enable automatic resolution, this value should be false.</description>
- </property>
- <property>
- <name>lens.cube.query.promote.groupby.toselect</name>
- <value>true</value>
- <description>Tells whether to promote group by clauses to be promoted to select expressions if they are already not projected.
- To enable automatic promotion, this value should be true.</description>
- </property>
-
- <property>
- <name>lens.cube.query.promote.select.togroupby</name>
- <value>true</value>
- <description>Tells whether to promote select expressions which is not inside any aggregate, to be promoted to groupby clauses, if they are already not part of groupby clauses.
- To enable automatic promotion, this value should be true.</description>
- </property>
-
- <property>
- <name>lens.cube.query.fail.if.data.partial</name>
- <value>true</value>
- <description>Whether to fail the query of data is partial</description>
- </property>
</configuration>