You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/01/13 10:45:40 UTC
incubator-lens git commit: LENS-196: Fixes the issues caused by
LENS-181: 1. War expension not happening in dev setup. 2. Broken lens-cli
packaging. spring xml not getting packaged.
Repository: incubator-lens
Updated Branches:
refs/heads/master c66319ba8 -> e16e34bd1
LENS-196: Fixes the issues caused by LENS-181:
1. War expension not happening in dev setup.
2. Broken lens-cli packaging. spring xml not getting packaged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/e16e34bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/e16e34bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/e16e34bd
Branch: refs/heads/master
Commit: e16e34bd146ffd0a91f21a82703c65e9404e5de9
Parents: c66319b
Author: Rajat Khandelwal <ra...@inmobi.com>
Authored: Tue Jan 13 15:13:45 2015 +0530
Committer: Rajat Khandelwal <ra...@inmobi.com>
Committed: Tue Jan 13 15:13:45 2015 +0530
----------------------------------------------------------------------
lens-dist/pom.xml | 2 +-
lens-server/pom.xml | 6 ------
pom.xml | 6 +++++-
tools/scripts/lens-config.sh | 7 ++++++-
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e16e34bd/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 0c49bf0..4b870c2 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -143,4 +143,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e16e34bd/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 479e964..10accd9 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -205,12 +205,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e16e34bd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e7b1f1c..be7c17d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,6 +247,10 @@
<targetPath>${mvn.deb.build.dir}/control</targetPath>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
<pluginManagement>
@@ -933,4 +937,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e16e34bd/tools/scripts/lens-config.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-config.sh b/tools/scripts/lens-config.sh
index 9f5d6e7..8bd9013 100644
--- a/tools/scripts/lens-config.sh
+++ b/tools/scripts/lens-config.sh
@@ -94,7 +94,12 @@ case $type in
LENS_EXPANDED_WEBAPP_DIR=${LENS_EXPANDED_WEBAPP_DIR:-${BASEDIR}/webapp}
export LENS_EXPANDED_WEBAPP_DIR
# set the server classpath
-
+ if [ ! -d ${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF ]; then
+ mkdir -p ${LENS_EXPANDED_WEBAPP_DIR}/lens-server
+ cd ${LENS_EXPANDED_WEBAPP_DIR}/lens-server
+ $JAR_BIN -xf ${BASEDIR}/webapp/lens-server.war
+ cd -
+ fi
LENSCPPATH="${LENSCPPATH}:${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/classes"
LENSCPPATH=${LENSCPPATH}:`ls ${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
LENSCPPATH=${LENSCPPATH}:`ls ${BASEDIR}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`