AMQ-6664 - Adding missing header tag to JSP files

Also fixing JSP comments. This fix is a follow on to AMQ-6620 (cherry picked from commit 04b60cb188)
2017-05-24 16:22:23 -04:00 · 2017-05-24 16:22:23 -04:00 · 908ef64728
parent bf395fcdb3
commit 908ef64728
21 changed files with 24 additions and 18 deletions
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/graph.jsp
+++ b/activemq-web-console/src/main/webapp/graph.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/index.jsp
+++ b/activemq-web-console/src/main/webapp/index.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/network.jsp
+++ b/activemq-web-console/src/main/webapp/network.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <c:set var="pageTitle" value="Network Bridges"/>
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/queueGraph.jsp
+++ b/activemq-web-console/src/main/webapp/queueGraph.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/scheduled.jsp
+++ b/activemq-web-console/src/main/webapp/scheduled.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/send.jsp
+++ b/activemq-web-console/src/main/webapp/send.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/slave.jsp
+++ b/activemq-web-console/src/main/webapp/slave.jsp
@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/topics.jsp
+++ b/activemq-web-console/src/main/webapp/topics.jsp
@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 <html>
 <head>
--- a/activemq-web-console/src/main/webapp/xml/queues.jsp
+++ b/activemq-web-console/src/main/webapp/xml/queues.jsp
@ -15,6 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
 <queues>
 <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
 <queue name="<c:out value="${row.name}" />">
--- a/activemq-web-console/src/main/webapp/xml/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
@ -15,6 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
 <subscribers>
 <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row">
 <subscriber clientId="<c:out value="${row.clientId}"/>" 
--- a/activemq-web-console/src/main/webapp/xml/topics.jsp
+++ b/activemq-web-console/src/main/webapp/xml/topics.jsp
@ -15,6 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
 <topics>
 <c:forEach items="${requestContext.brokerQuery.topics}" var="row">
 <topic name="<c:out value="${row.name}"/> ">