--no commit message

--no commit message

h2/src/main/org/h2/server/web/AppThread.java

@@ -960,6 +960,11 @@ public class AppThread extends WebServerThread {
             }
             time = System.currentTimeMillis() - time;
             buff.append(getResultSet(sql, rs, metadata, edit, time, allowEdit));
+//            SQLWarning warning = stat.getWarnings();
+//            if(warning != null) {
+//                buff.append("<br />Warning:<br />");
+//                buff.append(getStackTrace(id, warning));
+//            }
             if(!edit) {
                 stat.close();
             }

h2/src/main/org/h2/server/web/DbSchema.java

@@ -29,6 +29,9 @@ public class DbSchema {
         ArrayList list = new ArrayList();
         while(rs.next()) {
             DbTableOrView table = new DbTableOrView(this, rs);
+            if(contents.isOracle && table.name.indexOf('$') > 0) {
+                continue;
+            }
             list.add(table);
         }
         rs.close();

h2/src/main/org/h2/server/web/WebServerThread.java

@@ -93,16 +93,23 @@ abstract class WebServerThread extends Thread {
                 // TODO web: support errors
                 String mimeType;
                 boolean cache;
-                if(file.endsWith(".ico")) {
+                int index = file.lastIndexOf('.');
+                String suffix;
+                if(index >= 0) {
+                    suffix = file.substring(index+1);
+                } else {
+                    suffix = "";
+                }
+                if(suffix.equals("ico")) {
                     mimeType = "image/x-icon";
                     cache=true;
-                } else if(file.endsWith(".gif")) {
+                } else if(suffix.equals("gif")) {
                     mimeType = "image/gif";
                     cache=true;
-                } else if(file.endsWith(".css")) {
+                } else if(suffix.equals("css")) {
                     cache=true;
                     mimeType = "text/css";
-                } else if(file.endsWith(".html") || file.endsWith(".do") || file.endsWith(".jsp")) {
+                } else if(suffix.equals("html") || suffix.equals("do") || suffix.equals("jsp")) {
                     cache=false;
                     mimeType = "text/html";
                     if (session == null) {
@@ -111,7 +118,7 @@ abstract class WebServerThread extends Thread {
                             file = "index.do";
                         }
                     }
-                } else if(file.endsWith(".js")) {
+                } else if(suffix.equals("js")) {
                     cache=true;
                     mimeType = "text/javascript";
                 } else {

h2/src/main/org/h2/server/web/res/admin.jsp

@@ -115,9 +115,10 @@ Initial Developer: H2 Group
             </tr>
         </c:forEach>
     </table>
+    </form>
     <p>
-        <a href="adminShutdown.do?jsessionid=${sessionId}">${text.adminShutdown}</a> 
+	    <form name="shutdown" method="post" action="/adminShutdown.do?jsessionid=${sessionId}">
+	    	<input type="submit" class="button" value="${text.adminShutdown}" />
+	    </form>
     </p>
-    
-    </form>
 </body></html>
\ No newline at end of file