You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2013/08/27 01:49:33 UTC
svn commit: r1517732 - in /hbase/branches/0.95: ./
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/
hbase-server/src/main/resources/hbase-webapps/master/ hbase-serve...
Author: eclark
Date: Mon Aug 26 23:49:33 2013
New Revision: 1517732
URL: http://svn.apache.org/r1517732
Log:
HBASE-9342 WebUI fixes after bootstrap 3.0 update
Modified:
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
hbase/branches/0.95/pom.xml
Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Mon Aug 26 23:49:33 2013
@@ -126,10 +126,9 @@ AssignmentManager assignmentManager = ma
<%if HBaseConfiguration.isShowConfInServlet()%>
<li><a href="/conf">HBase Configuration</a></li>
</%if>
- </ul>
- </div><!--/.nav-collapse -->
+ </ul>
+ </div><!--/.nav-collapse -->
</div>
- </div>
</div>
<div class="container">
Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon Mon Aug 26 23:49:33 2013
@@ -56,10 +56,6 @@ org.apache.hadoop.hbase.protobuf.generat
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/static/css/hbase.css" rel="stylesheet">
- <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
- <!--[if lt IE 9]>
- <script src="/static/js/html5shiv.js"></script>
- <![endif]-->
</head>
<body>
@@ -72,7 +68,7 @@ org.apache.hadoop.hbase.protobuf.generat
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
+ <a class="navbar-brand" href="/rs-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp Mon Aug 26 23:49:33 2013
@@ -19,25 +19,16 @@
--%>
<%@ page contentType="text/html;charset=UTF-8"
import="java.util.Date"
- import="java.util.HashMap"
import="org.apache.hadoop.conf.Configuration"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
import="org.apache.hadoop.hbase.client.HConnectionManager"
- import="org.apache.hadoop.hbase.HRegionInfo"
- import="org.apache.hadoop.hbase.ServerName"
- import="org.apache.hadoop.hbase.ServerLoad"
- import="org.apache.hadoop.hbase.RegionLoad"
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.snapshot.SnapshotInfo"
- import="org.apache.hadoop.hbase.util.Bytes"
- import="org.apache.hadoop.hbase.util.FSUtils"
- import="org.apache.hadoop.hbase.protobuf.ProtobufUtil"
import="org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription"
import="org.apache.hadoop.util.StringUtils"
- import="java.util.List"
- import="java.util.Map"
- import="org.apache.hadoop.hbase.HConstants"%>
-<%@ page import="org.apache.hadoop.hbase.TableName" %><%
+ import="org.apache.hadoop.hbase.TableName"
+ import="org.apache.hadoop.hbase.HBaseConfiguration" %>
+<%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
HBaseAdmin hbadmin = new HBaseAdmin(conf);
@@ -95,26 +86,25 @@
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
- <li><a href="/">Home</a></li>
- <li><a href="/tablesDetailed.jsp">Table Details</a></li>
- <li><a href="/logs/">Local logs</a></li>
- <li><a href="/logLevel">Log Level</a></li>
- <li><a href="/dump">Debug dump</a></li>
- <li><a href="/jmx">Metrics Dump</a></li>
- </ul>
+ <li><a href="/master-status">Home</a></li>
+ <li><a href="/tablesDetailed.jsp">Table Details</a></li>
+ <li><a href="/logs/">Local logs</a></li>
+ <li><a href="/logLevel">Log Level</a></li>
+ <li><a href="/dump">Debug dump</a></li>
+ <li><a href="/jmx">Metrics Dump</a></li>
+ <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+ <li><a href="/conf">HBase Configuration</a></li>
+ <% } %>
+ </ul>
</div><!--/.nav-collapse -->
- </div>
</div>
- </div>
+</div>
<% if (isActionResultPage) { %>
<div class="container">
<div class="row inner_header">
- <div class="span8">
+ <div class="page-header">
<h1>Snapshot action request...</h1>
</div>
- <div class="span4 logo">
- <img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
- </div>
</div>
<p><hr><p>
<%
@@ -135,23 +125,17 @@
<% } else if (snapshot == null) { %>
<div class="container">
<div class="row inner_header">
- <div class="span8">
+ <div class="page-header">
<h1>Snapshot "<%= snapshotName %>" does not exists</h1>
</div>
- <div class="span4 logo">
- <img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
- </div>
</div>
<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect.
<% } else { %>
<div class="container">
<div class="row">
- <div class="span8">
+ <div class="page-header">
<h1>Snapshot: <%= snapshotName %></h1>
</div>
- <div class="span4">
- <img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
- </div>
</div>
<h2>Snapshot Attributes</h2>
<table class="table table-striped" width="90%" >
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/table.jsp?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/table.jsp Mon Aug 26 23:49:33 2013
@@ -20,13 +20,11 @@
<%@ page contentType="text/html;charset=UTF-8"
import="static org.apache.commons.lang.StringEscapeUtils.escapeXml"
import="java.util.HashMap"
- import="java.util.List"
import="java.util.Map"
import="org.apache.hadoop.conf.Configuration"
import="org.apache.hadoop.hbase.client.HTable"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
import="org.apache.hadoop.hbase.client.HConnectionManager"
- import="org.apache.hadoop.hbase.HConstants"
import="org.apache.hadoop.hbase.HRegionInfo"
import="org.apache.hadoop.hbase.ServerName"
import="org.apache.hadoop.hbase.ServerLoad"
@@ -34,8 +32,8 @@
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.util.Bytes"
import="org.apache.hadoop.hbase.util.FSUtils"
- import="org.apache.hadoop.hbase.protobuf.ProtobufUtil"%>
-<%@ page import="org.apache.hadoop.hbase.TableName" %>
+ import="org.apache.hadoop.hbase.TableName"
+ import="org.apache.hadoop.hbase.HBaseConfiguration" %>
<%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
@@ -73,9 +71,9 @@
<meta name="author" content="">
- <link href="/static/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
- <link href="/static/css/hbase.css" rel="stylesheet">
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
<meta http-equiv="refresh" content="5,javascript:history.back()" />
</head>
<body>
@@ -91,17 +89,19 @@
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
- <li><a href="/">Home</a></li>
+ <li><a href="/master-status">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li>
<li><a href="/logs/">Local logs</a></li>
<li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li>
+ <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+ <li><a href="/conf">HBase Configuration</a></li>
+ <% } %>
</ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
+ </div><!--/.nav-collapse -->
</div>
+</div>
<div class="container">
@@ -145,35 +145,36 @@
<meta name="author" content="">
- <link href="/static/css/bootstrap.css" rel="stylesheet">
- <link href="/static/css/hbase.css" rel="stylesheet">
- <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
- <div class="nav-collapse">
- <ul class="nav">
- <li><a href="/">Home</a></li>
+<div class="navbar navbar-fixed-top navbar-default">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
+ </div>
+ <div class="collapse navbar-collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="/master-status">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li>
<li><a href="/logs/">Local logs</a></li>
<li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug dump</a></li>
+ <li><a href="/jmx">Metrics Dump</a></li>
</ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
+ </div><!--/.nav-collapse -->
</div>
+</div>
<div class="container">
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp Mon Aug 26 23:49:33 2013
@@ -19,12 +19,12 @@
--%>
<%@ page contentType="text/html;charset=UTF-8"
import="static org.apache.commons.lang.StringEscapeUtils.escapeXml"
- import="java.util.*"
- import="org.apache.hadoop.util.StringUtils"
import="org.apache.hadoop.conf.Configuration"
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
- import="org.apache.hadoop.hbase.HTableDescriptor" %><%
+ import="org.apache.hadoop.hbase.HTableDescriptor"
+ import="org.apache.hadoop.hbase.HBaseConfiguration" %>
+<%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
%>
@@ -41,9 +41,9 @@
<meta name="author" content="">
- <link href="/static/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
- <link href="/static/css/hbase.css" rel="stylesheet">
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
</head>
<body>
@@ -60,19 +60,21 @@
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
- <li><a href="/master-status">Home</a></li>
- <li class="active"><a href="/tablesDetailed.jsp">Table Details</a></li>
- <li><a href="/logs/">Local logs</a></li>
- <li><a href="/logLevel">Log Level</a></li>
- <li><a href="/dump">Debug dump</a></li>
- <li><a href="/jmx">Metrics Dump</a></li>
- </ul>
+ <li class="active"><a href="/master-status">Home</a></li>
+ <li><a href="/tablesDetailed.jsp">Table Details</a></li>
+ <li><a href="/logs/">Local logs</a></li>
+ <li><a href="/logLevel">Log Level</a></li>
+ <li><a href="/dump">Debug dump</a></li>
+ <li><a href="/jmx">Metrics Dump</a></li>
+ <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+ <li><a href="/conf">HBase Configuration</a></li>
+ <% } %>
+ </ul>
</div><!--/.nav-collapse -->
- </div>
</div>
- </div>
+ </div>
- <div class="container">
+ <div class="container">
<div class="row inner_header">
<div class="page-header">
<h1>User Tables</h1>
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp Mon Aug 26 23:49:33 2013
@@ -18,17 +18,10 @@
*/
--%>
<%@ page contentType="text/html;charset=UTF-8"
- import="java.io.IOException"
- import="org.apache.hadoop.conf.Configuration"
- import="org.apache.hadoop.hbase.client.HBaseAdmin"
- import="org.apache.hadoop.hbase.client.HConnection"
- import="org.apache.hadoop.hbase.client.HConnectionManager"
- import="org.apache.hadoop.hbase.HRegionInfo"
import="org.apache.hadoop.hbase.zookeeper.ZKUtil"
import="org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher"
import="org.apache.hadoop.hbase.HBaseConfiguration"
- import="org.apache.hadoop.hbase.master.HMaster"
- import="org.apache.hadoop.hbase.HConstants"%><%
+ import="org.apache.hadoop.hbase.master.HMaster"%><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
ZooKeeperWatcher watcher = master.getZooKeeperWatcher();
%>
@@ -46,33 +39,36 @@
<meta name="author" content="">
- <link href="/static/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
- <link href="/static/css/hbase.css" rel="stylesheet">
+ <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
</head>
<body>
- <div class="navbar navbar-fixed-top navbar-default">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
- </div>
- <div class="collapse navbar-collapse">
- <ul class="nav navbar-nav">
- <li><a href="/">Home</a></li>
- <li><a href="/logs/">Local logs</a></li>
- <li><a href="/logLevel">Log Level</a></li>
- <li><a href="/dump">Debug dump</a></li>
- <li><a href="/jmx">Metrics Dump</a></li>
- </ul>
- </div><!--/.nav-collapse -->
+ <div class="navbar navbar-fixed-top navbar-default">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
+ </div>
+ <div class="collapse navbar-collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="/master-status">Home</a></li>
+ <li><a href="/tablesDetailed.jsp">Table Details</a></li>
+ <li><a href="/logs/">Local logs</a></li>
+ <li><a href="/logLevel">Log Level</a></li>
+ <li><a href="/dump">Debug dump</a></li>
+ <li><a href="/jmx">Metrics Dump</a></li>
+ <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+ <li><a href="/conf">HBase Configuration</a></li>
+ <% } %>
+ </ul>
+ </div><!--/.nav-collapse -->
</div>
- </div>
</div>
<div class="container">
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp Mon Aug 26 23:49:33 2013
@@ -21,9 +21,7 @@
import="org.apache.hadoop.conf.Configuration"
import="org.apache.hadoop.hbase.HBaseConfiguration"
import="org.apache.hadoop.hbase.util.VersionInfo"
- import="java.util.Date"
-%>
-
+ import="java.util.Date"%>
<%
Configuration conf = (Configuration)getServletContext().getAttribute("hbase.conf");
long startcode = conf.getLong("startcode", System.currentTimeMillis());
@@ -46,7 +44,6 @@ String listenPort = conf.get("hbase.rest
</head>
<body>
-
<div class="navbar navbar-fixed-top navbar-default">
<div class="container">
<div class="navbar-header">
@@ -59,18 +56,19 @@ String listenPort = conf.get("hbase.rest
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
- <li class="active"><a href="/">Home</a></li>
- <li><a href="/logs/">Local logs</a></li>
- <li><a href="/logLevel">Log Level</a></li>
- <li><a href="/jmx">Metrics Dump</a></li>
- <% if (HBaseConfiguration.isShowConfInServlet()) { %>
- <li><a href="/conf">HBase Configuration</a></li>
- <% } %>
- </ul>
+ <li class="active"><a href="/rest.jps">Home</a></li>
+ <li><a href="/tablesDetailed.jsp">Table Details</a></li>
+ <li><a href="/logs/">Local logs</a></li>
+ <li><a href="/logLevel">Log Level</a></li>
+ <li><a href="/dump">Debug dump</a></li>
+ <li><a href="/jmx">Metrics Dump</a></li>
+ <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+ <li><a href="/conf">HBase Configuration</a></li>
+ <% } %>
+ </ul>
</div><!--/.nav-collapse -->
- </div>
</div>
- </div>
+ </div>
<div class="container">
<div class="row inner_header">
Modified: hbase/branches/0.95/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/pom.xml?rev=1517732&r1=1517731&r2=1517732&view=diff
==============================================================================
--- hbase/branches/0.95/pom.xml (original)
+++ hbase/branches/0.95/pom.xml Mon Aug 26 23:49:33 2013
@@ -658,8 +658,9 @@
<exclude>**/*.avpr</exclude>
<exclude>**/*.svg</exclude>
<exclude>**/META-INF/services/**</exclude>
- <!-- MIT: http://code.google.com/p/html5shiv/ -->
- <exclude>**/html5shiv.js</exclude>
+ <!-- MIT: https://github.com/twbs/bootstrap/blob/master/LICENSE -->
+ <exclude>**/bootstrap-theme.css</exclude>
+ <exclude>**/bootstrap-theme.min.css</exclude>
<!-- MIT http://jquery.org/license -->
<exclude>**/jquery.min.js</exclude>
<!-- vector graphics -->