hbase git commit: HBASE-19291 Use common header and footer for JSP pages
Repository: hbase Updated Branches: refs/heads/branch-2 bcd367e29 -> 8f0f820f2 HBASE-19291 Use common header and footer for JSP pages Use header and footer in our *.jsp pages to avoid unnecessary redundancy (copy-paste of code) Misc edits: - Due to redundancy, new additions make it to some places but not others. For eg there are missing links to "/logLevel", "/processRS.jsp" in few places. - Fix processMaster.jsp wrongly pointing to rs-status instead of master-status (probably due to copy paste from processRS.jsp) - Deleted a bunch of extraneous "" in processMaster.jsp & processRS.jsp - Added missing tag in snapshot.jsp - Deleted fossils of html5shiv.js. It's uses and the js itself were deleted in the commit "819aed4ccd073d818bfef5931ec8d248bfae5f1f" - Fixed wrongly matched heading tags - Deleted some unused variables Tested: Ran standalone cluster and opened each page to make sure it looked right. Sidenote: Looks like HBASE-3835 started the work of converting from jsp to jamon, but the work didn't finish. Now we have a mix of jsp and jamon. Needs reconciling, but later. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8f0f820f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8f0f820f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8f0f820f Branch: refs/heads/branch-2 Commit: 8f0f820f22c2cdf715ae5c8acfe4753bf8a6350b Parents: bcd367e Author: Apekshit Authored: Fri Apr 8 00:50:33 2016 -0700 Committer: Apekshit Sharma Committed: Tue Nov 21 13:56:00 2017 -0800 -- .../resources/hbase-webapps/master/footer.jsp | 24 ++ .../resources/hbase-webapps/master/header.jsp | 67 +++ .../hbase-webapps/master/procedures.jsp | 63 +++ .../hbase-webapps/master/processMaster.jsp | 85 +--- .../resources/hbase-webapps/master/snapshot.jsp | 77 -- .../hbase-webapps/master/snapshotsStats.jsp | 52 ++-- .../resources/hbase-webapps/master/table.jsp| 72 +++-- .../hbase-webapps/master/tablesDetailed.jsp | 61 ++ .../main/resources/hbase-webapps/master/zk.jsp | 60 ++ .../hbase-webapps/regionserver/footer.jsp | 24 ++ .../hbase-webapps/regionserver/header.jsp | 65 +++ .../hbase-webapps/regionserver/processRS.jsp| 84 +-- .../hbase-webapps/regionserver/region.jsp | 62 ++ .../hbase-webapps/regionserver/storeFile.jsp| 55 ++--- 14 files changed, 288 insertions(+), 563 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8f0f820f/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp new file mode 100644 index 000..0aed242 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp @@ -0,0 +1,24 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/8f0f820f/hbase-server/src/main/resources/hbase-webapps/master/header.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp new file mode 100644 index 000..c7cbf3e --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp @@ -0,0 +1,67 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtai
hbase git commit: HBASE-19291 Use common header and footer for JSP pages
Repository: hbase Updated Branches: refs/heads/master 984e0ecfc -> 3b2b22b5f HBASE-19291 Use common header and footer for JSP pages Use header and footer in our *.jsp pages to avoid unnecessary redundancy (copy-paste of code) Misc edits: - Due to redundancy, new additions make it to some places but not others. For eg there are missing links to "/logLevel", "/processRS.jsp" in few places. - Fix processMaster.jsp wrongly pointing to rs-status instead of master-status (probably due to copy paste from processRS.jsp) - Deleted a bunch of extraneous "" in processMaster.jsp & processRS.jsp - Added missing tag in snapshot.jsp - Deleted fossils of html5shiv.js. It's uses and the js itself were deleted in the commit "819aed4ccd073d818bfef5931ec8d248bfae5f1f" - Fixed wrongly matched heading tags - Deleted some unused variables Tested: Ran standalone cluster and opened each page to make sure it looked right. Sidenote: Looks like HBASE-3835 started the work of converting from jsp to jamon, but the work didn't finish. Now we have a mix of jsp and jamon. Needs reconciling, but later. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3b2b22b5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3b2b22b5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3b2b22b5 Branch: refs/heads/master Commit: 3b2b22b5fac1175302b320b7ca1ed766326924cc Parents: 984e0ec Author: Apekshit Authored: Fri Apr 8 00:50:33 2016 -0700 Committer: Apekshit Sharma Committed: Tue Nov 21 13:52:32 2017 -0800 -- .../resources/hbase-webapps/master/footer.jsp | 24 ++ .../resources/hbase-webapps/master/header.jsp | 67 +++ .../hbase-webapps/master/procedures.jsp | 63 +++ .../hbase-webapps/master/processMaster.jsp | 85 +--- .../resources/hbase-webapps/master/snapshot.jsp | 77 -- .../hbase-webapps/master/snapshotsStats.jsp | 52 ++-- .../resources/hbase-webapps/master/table.jsp| 72 +++-- .../hbase-webapps/master/tablesDetailed.jsp | 61 ++ .../main/resources/hbase-webapps/master/zk.jsp | 60 ++ .../hbase-webapps/regionserver/footer.jsp | 24 ++ .../hbase-webapps/regionserver/header.jsp | 65 +++ .../hbase-webapps/regionserver/processRS.jsp| 84 +-- .../hbase-webapps/regionserver/region.jsp | 62 ++ .../hbase-webapps/regionserver/storeFile.jsp| 55 ++--- 14 files changed, 288 insertions(+), 563 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/3b2b22b5/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp new file mode 100644 index 000..0aed242 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp @@ -0,0 +1,24 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/3b2b22b5/hbase-server/src/main/resources/hbase-webapps/master/header.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp new file mode 100644 index 000..c7cbf3e --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp @@ -0,0 +1,67 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a
