Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1095 from jbonofre/REMOVE_PAXWEB_WA 

NO-JIRA: Remove the workaround for PAXWEB-1070 (not needed anymore)
This commit is contained in:
JB Onofré 2023-10-24 07:36:13 +02:00 committed by GitHub
parent 1664df939f d65d630a41
commit b4ace5858b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-web-console/src/main/webapp/WEB-INF/web.xml
View File

@ -124,15 +124,12 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Factor out common headers in JSP pages --> <!-- Factor out common headers in JSP pages -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Removing the auto prelude as long as the workaround is in place -->
<!--
<jsp-config> <jsp-config>
<jsp-property-group> <jsp-property-group>
<url-pattern>*.jsp</url-pattern> <url-pattern>*.jsp</url-pattern>
<include-prelude>/WEB-INF/jspf/headertags.jspf</include-prelude> <include-prelude>/WEB-INF/jspf/headertags.jspf</include-prelude>
</jsp-property-group> </jsp-property-group>
</jsp-config> </jsp-config>
-->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Error pages --> <!-- Error pages -->

2
activemq-web-console/src/main/webapp/browse.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Browse ${requestContext.queueBrowser.JMSDestination}"/> <c:set var="pageTitle" value="Browse ${requestContext.queueBrowser.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/connection.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="row" value="${requestContext.connectionQuery.connection}"/> <c:set var="row" value="${requestContext.connectionQuery.connection}"/>

2
activemq-web-console/src/main/webapp/connections.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Connections"/> <c:set var="pageTitle" value="Connections"/>

2
activemq-web-console/src/main/webapp/graph.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Browse ${requestContext.queueBrowser.JMSDestination}"/> <c:set var="pageTitle" value="Browse ${requestContext.queueBrowser.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/index.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="ActiveMQ Console"/> <c:set var="pageTitle" value="ActiveMQ Console"/>

1
activemq-web-console/src/main/webapp/logout.jsp
View File

@ -17,7 +17,6 @@
<% <%
response.setStatus(401); response.setStatus(401);
%> %>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="ActiveMQ Console"/> <c:set var="pageTitle" value="ActiveMQ Console"/>

2
activemq-web-console/src/main/webapp/message.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="row" value="${requestContext.messageQuery.message}"/> <c:set var="row" value="${requestContext.messageQuery.message}"/>

2
activemq-web-console/src/main/webapp/network.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<c:set var="pageTitle" value="Network Bridges"/> <c:set var="pageTitle" value="Network Bridges"/>

2
activemq-web-console/src/main/webapp/queueConsumers.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Consumers for ${requestContext.queueConsumerQuery.JMSDestination}"/> <c:set var="pageTitle" value="Consumers for ${requestContext.queueConsumerQuery.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/queueGraph.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Queues"/> <c:set var="pageTitle" value="Queues"/>

2
activemq-web-console/src/main/webapp/queueProducers.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Producers for Queue ${requestContext.queueProducerQuery.JMSDestination}"/> <c:set var="pageTitle" value="Producers for Queue ${requestContext.queueProducerQuery.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/queues.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Queues"/> <c:set var="pageTitle" value="Queues"/>

2
activemq-web-console/src/main/webapp/scheduled.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Messages Scheduled for Future Delivery"/> <c:set var="pageTitle" value="Messages Scheduled for Future Delivery"/>

2
activemq-web-console/src/main/webapp/send.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Send Messages"/> <c:set var="pageTitle" value="Send Messages"/>

2
activemq-web-console/src/main/webapp/slave.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. 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"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

2
activemq-web-console/src/main/webapp/subscribers.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Durable Topic Subscribers"/> <c:set var="pageTitle" value="Durable Topic Subscribers"/>

2
activemq-web-console/src/main/webapp/topicProducers.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Producers for Topic ${requestContext.topicProducerQuery.JMSDestination}"/> <c:set var="pageTitle" value="Producers for Topic ${requestContext.topicProducerQuery.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/topicSubscribers.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Subscribers for Topic ${requestContext.topicSubscriberQuery.JMSDestination}"/> <c:set var="pageTitle" value="Subscribers for Topic ${requestContext.topicSubscriberQuery.JMSDestination}"/>

2
activemq-web-console/src/main/webapp/topics.jsp
View File

@ -14,8 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--%> --%>
<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html> <html>
<head> <head>
<c:set var="pageTitle" value="Topics"/> <c:set var="pageTitle" value="Topics"/>