Removed the hadoop dependences from the main blur lib dir and they now reside in a sub directory in lib/hadoop-VERSION/lib. This will allow users to change the hadoop version and distro more easily by setting HADOOP_HOME in the blur-env.sh file in the conf/ directory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/728f4a82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/728f4a82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/728f4a82 Branch: refs/heads/0.2.0-newtypesystem Commit: 728f4a82403eca04c39327a68d417cf8b187de91 Parents: 7ce5596 Author: Aaron McCurry <[email protected]> Authored: Wed Aug 7 21:25:59 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Aug 7 21:25:59 2013 -0400 ---------------------------------------------------------------------- distribution/src/assemble/bin.xml | 51 ++++++++++++++++++-- .../src/main/scripts/bin/blur-config.sh | 12 +++++ 2 files changed, 58 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/728f4a82/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 384080c..b7da74f 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -22,19 +22,60 @@ under the License. <id>bin</id> <formats> <format>tar.gz</format> - <format>zip</format> + <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <dependencySets> <dependencySet> - <!-- - Project artifact is not copied under library directory since - it is added to the root directory of the zip package. - --> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>apache-blur-${project.version}/lib</outputDirectory> <unpack>false</unpack> + <includes> + <include>org.apache.blur:*</include> + + <include>org.apache.zookeeper:zookeeper</include> + <include>org.slf4j:slf4j-api</include> + <include>org.slf4j:slf4j-log4j12</include> + <include>org.json:json</include> + <include>log4j:log4j</include> + <include>com.yammer.metrics:*</include> + <include>com.google.guava:guava</include> + <include>org.apache.httpcomponents:*</include> + <include>org.apache.lucene:*</include> + <include>commons-cli:commons-cli</include> + <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include> + <include>jline:jline</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>apache-blur-${project.version}/lib/hadoop-${hadoop.version}</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.apache.hadoop:*</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>apache-blur-${project.version}/lib/hadoop-${hadoop.version}/lib</outputDirectory> + <unpack>false</unpack> + <excludes> + <exclude>org.apache.blur:*</exclude> + + <exclude>org.apache.zookeeper:zookeeper</exclude> + <exclude>org.slf4j:slf4j-api</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.json:json</exclude> + <exclude>log4j:log4j</exclude> + <exclude>com.yammer.metrics:*</exclude> + <exclude>com.google.guava:guava</exclude> + <exclude>org.apache.httpcomponents:*</exclude> + <exclude>org.apache.lucene:*</exclude> + <exclude>commons-cli:commons-cli</exclude> + <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude> + <exclude>jline:jline</exclude> + </excludes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/728f4a82/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 7c11605..823c33c 100755 --- a/distribution/src/main/scripts/bin/blur-config.sh +++ b/distribution/src/main/scripts/bin/blur-config.sh @@ -65,6 +65,18 @@ for f in $BLUR_HOME/lib/*.war; do BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f; done +if [ -z "$HADOOP_HOME" ]; then + export HADOOP_HOME=`ls -d1 $BLUR_HOME/lib/hadoop-*/ | head -1` +fi + +for f in $HADOOP_HOME/hadoop*/*.jar; do + BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f; +done + +for f in $HADOOP_HOME/lib/*.jar; do + BLUR_CLASSPATH=${BLUR_CLASSPATH}:$f; +done + export BLUR_CLASSPATH HOSTNAME=`hostname`
