Merge pull request #1095 from jbonofre/REMOVE_PAXWEB_WA

NO-JIRA: Remove the workaround for PAXWEB-1070 (not needed anymore)
2023-10-24 07:36:13 +02:00 · 2023-10-24 07:36:13 +02:00 · b4ace5858b
parent 1664df939f d65d630a41
commit b4ace5858b
20 changed files with 0 additions and 40 deletions
--- 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       -->
--- 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}"/>
--- 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}"/>
--- 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"/>
--- 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}"/>
--- 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"/>
--- 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"/>
--- 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}"/>
--- 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"/>

--- 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}"/>
--- 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"/>
--- 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}"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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">

--- 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"/>
--- 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}"/>
--- 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}"/>
--- 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"/>