You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/05/20 11:02:19 UTC
svn commit: r946571 - in /hbase/trunk: CHANGES.txt bin/hbase pom.xml
src/assembly/bin.xml
Author: stack
Date: Thu May 20 09:02:18 2010
New Revision: 946571
URL: http://svn.apache.org/viewvc?rev=946571&view=rev
Log:
HBASE-2583 Make webapps work in distributed mode again and make webapps deploy at / instead of at /webapps/master/master.jsp
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/bin/hbase
hbase/trunk/pom.xml
hbase/trunk/src/assembly/bin.xml
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=946571&r1=946570&r2=946571&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu May 20 09:02:18 2010
@@ -346,6 +346,8 @@ Release 0.21.0 - Unreleased
HBASE-2576 TestHRegion.testDelete_mixed() failing on hudson
HBASE-2581 Bloom commit broke some tests... fix
HBASE-2582 TestTableSchemaModel not passing after commit of blooms
+ HBASE-2583 Make webapps work in distributed mode again and make webapps
+ deploy at / instead of at /webapps/master/master.jsp
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=946571&r1=946570&r2=946571&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Thu May 20 09:02:18 2010
@@ -105,21 +105,32 @@ CLASSPATH="${HBASE_CONF_DIR}"
CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
add_maven_deps_to_classpath() {
- f="/tmp/hbase-core-test-classpath.txt"
- ${MVN} -f core/pom.xml dependency:build-classpath -Dmdep.outputFile="${f}" &> /dev/null
- # Add tests classes
+ # The maven build dir is called 'target'
+ target="${HBASE_HOME}/target"
+ if [ ! -d "${HBASE_HOME}/target" ]
+ then
+ mkdir "${target}"
+ fi
+ # Need to generate classpath from maven pom. This is costly so generate it
+ # and cache it. Save the file into our target dir so a mvn clean will get
+ # clean it up and force us create a new one.
+ f="${target}/cached_classpath.txt"
+ if [ ! -f "${f}" ]
+ then
+ ${MVN} -f "${HBASE_HOME}/pom.xml" dependency:build-classpath -Dmdep.outputFile="${f}" &> /dev/null
+ fi
CLASSPATH=${CLASSPATH}:`cat "${f}"`
}
add_maven_main_classes_to_classpath() {
- if [ -d "$HBASE_HOME/core/target/classes" ]; then
- CLASSPATH=${CLASSPATH}:$HBASE_HOME/core/target/classes
+ if [ -d "$HBASE_HOME/target/classes" ]; then
+ CLASSPATH=${CLASSPATH}:$HBASE_HOME/target/classes
fi
}
add_maven_test_classes_to_classpath() {
# For developers, add hbase classes to CLASSPATH
- f="$HBASE_HOME/core/target/test-classes"
+ f="$HBASE_HOME/target/test-classes"
if [ -d "${f}" ]; then
CLASSPATH=${CLASSPATH}:${f}
fi
@@ -215,7 +226,7 @@ elif $in_sources_dir && [ "$COMMAND" = "
add_maven_main_classes_to_classpath
add_maven_test_classes_to_classpath
# Start the tests
- CORESRC="${HBASE_HOME}/core/src"
+ CORESRC="${HBASE_HOME}/src"
CLASS="org.jruby.Main -I${CORESRC}/main/ruby -I${CORESRC}/test/ruby ${CORESRC}/test/ruby/tests_runner.rb"
elif [ "$COMMAND" = "master" ] ; then
CLASS='org.apache.hadoop.hbase.master.HMaster'
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=946571&r1=946570&r2=946571&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu May 20 09:02:18 2010
@@ -292,6 +292,7 @@
<excludes>
<exclude>org/apache/jute/**</exclude>
<exclude>org/apache/zookeeper/**</exclude>
+ <exclude>**/*.jsp</exclude>
</excludes>
</configuration>
</plugin>
@@ -599,6 +600,17 @@
<artifactId>jasper-runtime</artifactId>
<version>${jasper.version}</version>
</dependency>
+ <dependency>
+ <!--If this is not in the runtime lib, we get odd
+ "2009-02-27 11:38:39.504::WARN: failed jsp
+ java.lang.NoSuchFieldError: IS_SECURITY_ENABLED"
+ exceptions out of jetty deploying webapps.
+ St.Ack Thu May 20 01:04:41 PDT 2010
+ -->
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${jasper.version}</version>
+ </dependency>
<dependency>
<groupId>org.jruby</groupId>
Modified: hbase/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/assembly/bin.xml?rev=946571&r1=946570&r2=946571&view=diff
==============================================================================
--- hbase/trunk/src/assembly/bin.xml (original)
+++ hbase/trunk/src/assembly/bin.xml Thu May 20 09:02:18 2010
@@ -33,6 +33,13 @@
<include>*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>target/classes/webapps</directory>
+ <outputDirectory>webapps</outputDirectory>
+ <excludes>
+ <exclude>**/*.jsp</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>