You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2017/03/10 15:19:16 UTC
activemq git commit: [AMQ-6620] Workaround until the actual issue is
fixed in karaf
Repository: activemq
Updated Branches:
refs/heads/master ef064953b -> f651aa361
[AMQ-6620] Workaround until the actual issue is fixed in karaf
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f651aa36
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f651aa36
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f651aa36
Branch: refs/heads/master
Commit: f651aa361f8d8428c94420d1f5713c70ed0baf07
Parents: ef06495
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Mar 10 16:19:05 2017 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Mar 10 16:19:05 2017 +0100
----------------------------------------------------------------------
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 | 3 ++-
activemq-web-console/src/main/webapp/connections.jsp | 3 ++-
activemq-web-console/src/main/webapp/graph.jsp | 3 ++-
activemq-web-console/src/main/webapp/index.jsp | 3 ++-
activemq-web-console/src/main/webapp/message.jsp | 3 ++-
activemq-web-console/src/main/webapp/network.jsp | 3 ++-
activemq-web-console/src/main/webapp/queueConsumers.jsp | 3 ++-
activemq-web-console/src/main/webapp/queueGraph.jsp | 3 ++-
activemq-web-console/src/main/webapp/queueProducers.jsp | 3 ++-
activemq-web-console/src/main/webapp/queues.jsp | 3 ++-
activemq-web-console/src/main/webapp/scheduled.jsp | 3 ++-
activemq-web-console/src/main/webapp/send.jsp | 3 ++-
activemq-web-console/src/main/webapp/slave.jsp | 3 ++-
activemq-web-console/src/main/webapp/subscribers.jsp | 3 ++-
activemq-web-console/src/main/webapp/topicProducers.jsp | 3 ++-
activemq-web-console/src/main/webapp/topicSubscribers.jsp | 3 ++-
activemq-web-console/src/main/webapp/topics.jsp | 3 ++-
19 files changed, 39 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/activemq-web-console/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
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 962713e..b588e60 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml
@@ -124,12 +124,15 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- 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 -->
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 8f40f5a..c07e9ae 100644
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@@ -14,6 +14,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" %>
<html>
<head>
<c:set var="pageTitle" value="Browse ${requestContext.queueBrowser.JMSDestination}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 39beb8b..df0e69c 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 87dd1e2..d13e0cf 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html>
<head>
<c:set var="pageTitle" value="Connections"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 1e9c98b..fb4a268 100644
--- a/activemq-web-console/src/main/webapp/graph.jsp
+++ b/activemq-web-console/src/main/webapp/graph.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 f9dae8c..408bc8f 100644
--- a/activemq-web-console/src/main/webapp/index.jsp
+++ b/activemq-web-console/src/main/webapp/index.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 fbbb570..c0491a8 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 f72a15b..2bb854c 100644
--- a/activemq-web-console/src/main/webapp/network.jsp
+++ b/activemq-web-console/src/main/webapp/network.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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/f651aa36/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 d4fab07..33db794 100644
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 7ba6223..4998b78 100644
--- a/activemq-web-console/src/main/webapp/queueGraph.jsp
+++ b/activemq-web-console/src/main/webapp/queueGraph.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html>
<head>
<c:set var="pageTitle" value="Queues"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 c08be84..0a460e9 100644
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 c67cfa7..46edcf4 100644
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html>
<head>
<c:set var="pageTitle" value="Queues"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 1c59bb0..5e6a975 100644
--- a/activemq-web-console/src/main/webapp/scheduled.jsp
+++ b/activemq-web-console/src/main/webapp/scheduled.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 d257231..de84116 100644
--- a/activemq-web-console/src/main/webapp/send.jsp
+++ b/activemq-web-console/src/main/webapp/send.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 ded5607..4ef058a 100644
--- a/activemq-web-console/src/main/webapp/slave.jsp
+++ b/activemq-web-console/src/main/webapp/slave.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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/f651aa36/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 07b0b09..8c057b5 100644
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 f90de93..ca4d3b5 100644
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 71f9693..2fa5fbe 100644
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- 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}"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f651aa36/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 332a10c..cf35bbb 100644
--- a/activemq-web-console/src/main/webapp/topics.jsp
+++ b/activemq-web-console/src/main/webapp/topics.jsp
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 -->
+<%@include file="WEB-INF/jspf/headertags.jspf" %>
<html>
<head>
<c:set var="pageTitle" value="Topics"/>