incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/4] git commit: Fixes to classpath in the blur-config.sh and added missing libs to distro.
Date Thu, 22 Aug 2013 21:54:47 GMT
Fixes to classpath in the blur-config.sh and added missing libs to distro.


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

Branch: refs/heads/master
Commit: a4855d6840546e4e35a857d31e88346f04869656
Parents: 0686fac
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Aug 22 17:07:55 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Aug 22 17:07:55 2013 -0400

----------------------------------------------------------------------
 distribution/src/assemble/bin.xml                | 2 ++
 distribution/src/main/scripts/bin/blur-config.sh | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a4855d68/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index 9428cc2..3f87511 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -46,6 +46,7 @@ under the License.
         <include>commons-cli:commons-cli</include>
         <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
         <include>jline:jline</include>
+        <include>com.fasterxml.jackson.core:*</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -76,6 +77,7 @@ under the License.
 	  <exclude>commons-cli:commons-cli</exclude>
 	  <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude>
 	  <exclude>jline:jline</exclude>
+      <exclude>com.fasterxml.jackson.core:*</exclude>
 	</excludes>
     </dependencySet>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a4855d68/distribution/src/main/scripts/bin/blur-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/bin/blur-config.sh b/distribution/src/main/scripts/bin/blur-config.sh
index 823c33c..c7251eb 100755
--- a/distribution/src/main/scripts/bin/blur-config.sh
+++ b/distribution/src/main/scripts/bin/blur-config.sh
@@ -66,10 +66,12 @@ for f in $BLUR_HOME/lib/*.war; do
 done
 
 if [ -z "$HADOOP_HOME" ]; then
-	export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1`
+  export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1`
 fi
 
-for f in $HADOOP_HOME/hadoop*/*.jar; do
+BLUR_CLASSPATH=${BLUR_CLASSPATH}:$HADOOP_HOME/conf
+
+for f in $HADOOP_HOME/*.jar; do
   BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f;
 done
 


Mime
View raw message