This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new d65d630a4 NO-JIRA: Remove the workaround for PAXWEB-1070 (not needed
anymore)
new b4ace5858 Merge pull request #1095 from jbonofre/REMOVE_PAXWEB_WA
d65d630a4 is described below
commit d65d630a41a59d79873d44fcfc20a2ed130f037a
Author: JB Onofré <[email protected]>
AuthorDate: Mon Oct 23 11:38:23 2023 +0200
NO-JIRA: Remove the workaround for PAXWEB-1070 (not needed anymore)
---
activemq-web-console/src/main/webapp/WEB-INF/web.xml | 3 ---
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/logout.jsp | 1 -
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 --
20 files changed, 40 deletions(-)
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
index 986f22e55..d67e9d006 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
@@ -124,15 +124,12 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Factor out common headers in JSP pages -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <!-- Removing the auto prelude as long as the workaround is in place -->
- <!--
<jsp-config>
<jsp-property-group>
<url-pattern>*.jsp</url-pattern>
<include-prelude>/WEB-INF/jspf/headertags.jspf</include-prelude>
</jsp-property-group>
</jsp-config>
- -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Error pages -->
diff --git a/activemq-web-console/src/main/webapp/browse.jsp
b/activemq-web-console/src/main/webapp/browse.jsp
index ce093e43d..39a5f356c 100644
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Browse
${requestContext.queueBrowser.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/connection.jsp
b/activemq-web-console/src/main/webapp/connection.jsp
index 7d218e257..474dadce6 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="row" value="${requestContext.connectionQuery.connection}"/>
diff --git a/activemq-web-console/src/main/webapp/connections.jsp
b/activemq-web-console/src/main/webapp/connections.jsp
index 5663b358d..30d41d76f 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Connections"/>
diff --git a/activemq-web-console/src/main/webapp/graph.jsp
b/activemq-web-console/src/main/webapp/graph.jsp
index 5c0c2fdc1..3f87f96aa 100644
--- a/activemq-web-console/src/main/webapp/graph.jsp
+++ b/activemq-web-console/src/main/webapp/graph.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Browse
${requestContext.queueBrowser.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/index.jsp
b/activemq-web-console/src/main/webapp/index.jsp
index 83f43eecf..885914739 100644
--- a/activemq-web-console/src/main/webapp/index.jsp
+++ b/activemq-web-console/src/main/webapp/index.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="ActiveMQ Console"/>
diff --git a/activemq-web-console/src/main/webapp/logout.jsp
b/activemq-web-console/src/main/webapp/logout.jsp
index e1bd0bf93..5c86f7baa 100644
--- a/activemq-web-console/src/main/webapp/logout.jsp
+++ b/activemq-web-console/src/main/webapp/logout.jsp
@@ -17,7 +17,6 @@
<%
response.setStatus(401);
%>
-<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html>
<head>
<c:set var="pageTitle" value="ActiveMQ Console"/>
diff --git a/activemq-web-console/src/main/webapp/message.jsp
b/activemq-web-console/src/main/webapp/message.jsp
index 132d596d6..e87be9289 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="row" value="${requestContext.messageQuery.message}"/>
diff --git a/activemq-web-console/src/main/webapp/network.jsp
b/activemq-web-console/src/main/webapp/network.jsp
index df2a08f31..f817829a9 100644
--- a/activemq-web-console/src/main/webapp/network.jsp
+++ b/activemq-web-console/src/main/webapp/network.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<c:set var="pageTitle" value="Network Bridges"/>
diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp
b/activemq-web-console/src/main/webapp/queueConsumers.jsp
index 51613975a..ccefb8994 100644
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Consumers for
${requestContext.queueConsumerQuery.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/queueGraph.jsp
b/activemq-web-console/src/main/webapp/queueGraph.jsp
index ac8b7806a..762877890 100644
--- a/activemq-web-console/src/main/webapp/queueGraph.jsp
+++ b/activemq-web-console/src/main/webapp/queueGraph.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Queues"/>
diff --git a/activemq-web-console/src/main/webapp/queueProducers.jsp
b/activemq-web-console/src/main/webapp/queueProducers.jsp
index e30bf298a..995366985 100644
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Producers for Queue
${requestContext.queueProducerQuery.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/queues.jsp
b/activemq-web-console/src/main/webapp/queues.jsp
index 4bd8efd50..c9081f93c 100644
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Queues"/>
diff --git a/activemq-web-console/src/main/webapp/scheduled.jsp
b/activemq-web-console/src/main/webapp/scheduled.jsp
index cac68c399..e2c8c8837 100644
--- a/activemq-web-console/src/main/webapp/scheduled.jsp
+++ b/activemq-web-console/src/main/webapp/scheduled.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Messages Scheduled for Future Delivery"/>
diff --git a/activemq-web-console/src/main/webapp/send.jsp
b/activemq-web-console/src/main/webapp/send.jsp
index 9c095e908..ab0404094 100644
--- a/activemq-web-console/src/main/webapp/send.jsp
+++ b/activemq-web-console/src/main/webapp/send.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Send Messages"/>
diff --git a/activemq-web-console/src/main/webapp/slave.jsp
b/activemq-web-console/src/main/webapp/slave.jsp
index b73987c7a..410604f44 100644
--- a/activemq-web-console/src/main/webapp/slave.jsp
+++ b/activemq-web-console/src/main/webapp/slave.jsp
@@ -14,8 +14,6 @@
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" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp
b/activemq-web-console/src/main/webapp/subscribers.jsp
index 97f2bfe48..f2b62dfa7 100644
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Durable Topic Subscribers"/>
diff --git a/activemq-web-console/src/main/webapp/topicProducers.jsp
b/activemq-web-console/src/main/webapp/topicProducers.jsp
index fcc10ce9a..5cefc9b86 100644
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Producers for Topic
${requestContext.topicProducerQuery.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
index 2b5027f60..7b83834c6 100644
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Subscribers for Topic
${requestContext.topicSubscriberQuery.JMSDestination}"/>
diff --git a/activemq-web-console/src/main/webapp/topics.jsp
b/activemq-web-console/src/main/webapp/topics.jsp
index d2e0a6de8..3043e04dc 100644
--- a/activemq-web-console/src/main/webapp/topics.jsp
+++ b/activemq-web-console/src/main/webapp/topics.jsp
@@ -14,8 +14,6 @@
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" %>
<html>
<head>
<c:set var="pageTitle" value="Topics"/>
