activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: AMQ-6664 - Adding missing header tag to JSP files
Date Wed, 24 May 2017 20:24:17 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x bf395fcdb -> 908ef6472


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 04b60cb188932a91be9f59d6cda09290219d8a45)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/908ef647
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/908ef647
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/908ef647

Branch: refs/heads/activemq-5.14.x
Commit: 908ef647289a80a6fec500a6d37dd59059dccfbd
Parents: bf395fc
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Wed May 24 16:22:23 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Wed May 24 16:24:10 2017 -0400

----------------------------------------------------------------------
 activemq-web-console/src/main/webapp/browse.jsp           | 2 +-
 activemq-web-console/src/main/webapp/connection.jsp       | 2 +-
 activemq-web-console/src/main/webapp/connections.jsp      | 2 +-
 activemq-web-console/src/main/webapp/graph.jsp            | 2 +-
 activemq-web-console/src/main/webapp/index.jsp            | 2 +-
 activemq-web-console/src/main/webapp/message.jsp          | 2 +-
 activemq-web-console/src/main/webapp/network.jsp          | 2 +-
 activemq-web-console/src/main/webapp/queueConsumers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueGraph.jsp       | 2 +-
 activemq-web-console/src/main/webapp/queueProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queues.jsp           | 2 +-
 activemq-web-console/src/main/webapp/scheduled.jsp        | 2 +-
 activemq-web-console/src/main/webapp/send.jsp             | 2 +-
 activemq-web-console/src/main/webapp/slave.jsp            | 2 +-
 activemq-web-console/src/main/webapp/subscribers.jsp      | 2 +-
 activemq-web-console/src/main/webapp/topicProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/topicSubscribers.jsp | 2 +-
 activemq-web-console/src/main/webapp/topics.jsp           | 2 +-
 activemq-web-console/src/main/webapp/xml/queues.jsp       | 2 ++
 activemq-web-console/src/main/webapp/xml/subscribers.jsp  | 2 ++
 activemq-web-console/src/main/webapp/xml/topics.jsp       | 2 ++
 21 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/browse.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/browse.jsp b/activemq-web-console/src/main/webapp/browse.jsp
index c07e9ae..0e18e15 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/connection.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/connection.jsp b/activemq-web-console/src/main/webapp/connection.jsp
index df0e69c..7d218e2 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/connections.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/connections.jsp b/activemq-web-console/src/main/webapp/connections.jsp
index d13e0cf..1d6fbab 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/graph.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/graph.jsp b/activemq-web-console/src/main/webapp/graph.jsp
index fb4a268..5c0c2fd 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/index.jsp b/activemq-web-console/src/main/webapp/index.jsp
index 408bc8f..83f43ee 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/message.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp
index c0491a8..7563d06 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/network.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/network.jsp b/activemq-web-console/src/main/webapp/network.jsp
index 2bb854c..df2a08f 100644
--- 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"/>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/queueConsumers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp b/activemq-web-console/src/main/webapp/queueConsumers.jsp
index 33db794..5161397 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/queueGraph.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/queueGraph.jsp b/activemq-web-console/src/main/webapp/queueGraph.jsp
index 4998b78..ac8b780 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/queueProducers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/queueProducers.jsp b/activemq-web-console/src/main/webapp/queueProducers.jsp
index 0a460e9..e30bf29 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/queues.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/queues.jsp b/activemq-web-console/src/main/webapp/queues.jsp
index 59d8643..4a1844e 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/scheduled.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/scheduled.jsp b/activemq-web-console/src/main/webapp/scheduled.jsp
index 5e6a975..cac68c3 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/send.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/send.jsp b/activemq-web-console/src/main/webapp/send.jsp
index de84116..9c095e9 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/slave.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/slave.jsp b/activemq-web-console/src/main/webapp/slave.jsp
index 4ef058a..1b17fbe 100644
--- 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">

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/subscribers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp b/activemq-web-console/src/main/webapp/subscribers.jsp
index 8c057b5..97f2bfe 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/topicProducers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/topicProducers.jsp b/activemq-web-console/src/main/webapp/topicProducers.jsp
index ca4d3b5..fcc10ce 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/topicSubscribers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/topicSubscribers.jsp b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
index 2fa5fbe..2b5027f 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/topics.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/topics.jsp b/activemq-web-console/src/main/webapp/topics.jsp
index cf35bbb..d2e0a6d 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/xml/queues.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/queues.jsp b/activemq-web-console/src/main/webapp/xml/queues.jsp
index faa67ca..d9935b7 100644
--- 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}" />">

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/xml/subscribers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/subscribers.jsp b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
index cc79795..774a4a1 100644
--- 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}"/>" 

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/xml/topics.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/topics.jsp b/activemq-web-console/src/main/webapp/xml/topics.jsp
index b3efc15..a967b1f 100644
--- 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}"/> ">


Mime
View raw message