You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2009/09/02 02:08:27 UTC
svn commit: r810315 - in /hadoop/hive/branches/branch-0.4: ./ hwi/
hwi/src/test/org/apache/hadoop/hive/hwi/
shims/src/0.20/java/org/apache/hadoop/hive/shims/
shims/src/common/java/org/apache/hadoop/hive/shims/
Author: namit
Date: Wed Sep 2 00:08:26 2009
New Revision: 810315
URL: http://svn.apache.org/viewvc?rev=810315&view=rev
Log:
HIVE-752. Bug in shimLoader for HWI server (Edward Capriolo via namit)
Added:
hadoop/hive/branches/branch-0.4/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java
Modified:
hadoop/hive/branches/branch-0.4/CHANGES.txt
hadoop/hive/branches/branch-0.4/hwi/build.xml
hadoop/hive/branches/branch-0.4/shims/src/0.20/java/org/apache/hadoop/hive/shims/Jetty20Shims.java
hadoop/hive/branches/branch-0.4/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
Modified: hadoop/hive/branches/branch-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/CHANGES.txt?rev=810315&r1=810314&r2=810315&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.4/CHANGES.txt Wed Sep 2 00:08:26 2009
@@ -537,6 +537,8 @@
HIVE-755. Driver NullPointerException when calling getResults without first compiling
(Eric Hwang via namit)
+ HIVE-752. Bug in shimLoader for HWI server (Edward Capriolo via namit)
+
Release 0.3.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/branches/branch-0.4/hwi/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/hwi/build.xml?rev=810315&r1=810314&r2=810315&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/hwi/build.xml (original)
+++ hadoop/hive/branches/branch-0.4/hwi/build.xml Wed Sep 2 00:08:26 2009
@@ -19,7 +19,7 @@
<fileset dir="${test.src.data.dir}" includes="files/*.jar"/>
<fileset dir="${hive.root}" includes="testlibs/*.jar"/>
<pathelement location="${build.dir.hive}/ql/test/classes"/>
- <path refid="classpath"/>
+ <path refid="classpath-hwi"/>
</path>
<target name="compile" depends="hwi-init">
Added: hadoop/hive/branches/branch-0.4/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java?rev=810315&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.4/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java (added)
+++ hadoop/hive/branches/branch-0.4/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java Wed Sep 2 00:08:26 2009
@@ -0,0 +1,47 @@
+package org.apache.hadoop.hive.hwi;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.conf.HiveConf;
+
+import junit.framework.TestCase;
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.conf.HiveConf;
+
+import org.apache.hadoop.hive.shims.JettyShims;
+import org.apache.hadoop.hive.shims.ShimLoader;
+
+public class TestHWIServer extends TestCase{
+
+ public TestHWIServer(String name) {
+ super(name);
+
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ }
+
+ public final void testServerInit() throws Exception {
+
+ JettyShims.Server webServer;
+ webServer = ShimLoader.getJettyShims().startServer("0.0.0.0", 9999);
+ assertNotNull(webServer);
+ webServer.addWar("../build/hive_hwi.war", "/hwi");
+ webServer.start();
+ // webServer.join();
+ webServer.stop();
+ assert(true);
+ }
+
+
+}
Modified: hadoop/hive/branches/branch-0.4/shims/src/0.20/java/org/apache/hadoop/hive/shims/Jetty20Shims.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/shims/src/0.20/java/org/apache/hadoop/hive/shims/Jetty20Shims.java?rev=810315&r1=810314&r2=810315&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/shims/src/0.20/java/org/apache/hadoop/hive/shims/Jetty20Shims.java (original)
+++ hadoop/hive/branches/branch-0.4/shims/src/0.20/java/org/apache/hadoop/hive/shims/Jetty20Shims.java Wed Sep 2 00:08:26 2009
@@ -34,6 +34,8 @@
private static class Server extends org.mortbay.jetty.Server implements JettyShims.Server {
public void addWar(String war, String contextPath) {
WebAppContext wac = new WebAppContext();
+ wac.setContextPath(contextPath);
+ wac.setWar(war);
RequestLogHandler rlh = new RequestLogHandler();
rlh.setHandler(wac);
this.addHandler(rlh);
@@ -48,4 +50,4 @@
this.addConnector(connector);
}
}
-}
\ No newline at end of file
+}
Modified: hadoop/hive/branches/branch-0.4/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java?rev=810315&r1=810314&r2=810315&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java (original)
+++ hadoop/hive/branches/branch-0.4/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java Wed Sep 2 00:08:26 2009
@@ -46,10 +46,10 @@
new HashMap<String, String>();
static {
- JETTY_SHIM_CLASSES.put("0.17", "org.apache.jetty.hive.shims.Jetty17Shims");
- JETTY_SHIM_CLASSES.put("0.18", "org.apache.jetty.hive.shims.Jetty18Shims");
- JETTY_SHIM_CLASSES.put("0.19", "org.apache.jetty.hive.shims.Jetty19Shims");
- JETTY_SHIM_CLASSES.put("0.20", "org.apache.jetty.hive.shims.Jetty20Shims");
+ JETTY_SHIM_CLASSES.put("0.17", "org.apache.hadoop.hive.shims.Jetty17Shims");
+ JETTY_SHIM_CLASSES.put("0.18", "org.apache.hadoop.hive.shims.Jetty18Shims");
+ JETTY_SHIM_CLASSES.put("0.19", "org.apache.hadoop.hive.shims.Jetty19Shims");
+ JETTY_SHIM_CLASSES.put("0.20", "org.apache.hadoop.hive.shims.Jetty20Shims");
}
@@ -103,4 +103,4 @@
}
return parts[0] + "." + parts[1];
}
-}
\ No newline at end of file
+}