Updated Branches: refs/heads/trunk bdf7aa482 -> f74a65f4f
[AMQ-4994] Remove site-mesh Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/cbc227cd Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/cbc227cd Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/cbc227cd Branch: refs/heads/trunk Commit: cbc227cd1c626cf0ba74ff7d8eafe4d0deb1ab40 Parents: da37753 Author: Daniel Kulp <[email protected]> Authored: Wed Jan 29 20:35:16 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Fri Jan 31 21:46:07 2014 -0500 ---------------------------------------------------------------------- activemq-web-console/pom.xml | 6 - .../src/main/webapp/WEB-INF/decorators.xml | 31 ---- .../main/webapp/WEB-INF/jspf/headertags.jspf | 1 - .../src/main/webapp/WEB-INF/web.xml | 13 -- .../src/main/webapp/decorators/main.jsp | 173 ------------------- .../src/main/webapp/decorators/panel.jsp | 32 ---- .../src/main/webapp/decorators/printable.jsp | 32 ---- 7 files changed, 288 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 1f06987..790e2ab 100755 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -240,12 +240,6 @@ <artifactId>log4j</artifactId> </dependency> - <!-- SiteMesh for layout --> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>sitemesh</artifactId> - </dependency> - <!-- JSTL support --> <dependency> <groupId>javax.servlet</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml b/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml deleted file mode 100644 index 0168e1b..0000000 --- a/activemq-web-console/src/main/webapp/WEB-INF/decorators.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<decorators defaultdir="/decorators"> - <excludes> - <pattern>/xml/*</pattern> - <pattern>/slave.jsp</pattern> - </excludes> - - <decorator name="main" page="main.jsp"> - <pattern>/*</pattern> - </decorator> - - <decorator name="panel" page="panel.jsp" /> - <decorator name="printable" page="printable.jsp" /> -</decorators> http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf index 4b69830..9896410 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf +++ b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --%> -<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator"; %> <%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %> <%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/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 9996c61..9f8e922 100755 --- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml @@ -28,19 +28,6 @@ <display-name>ActiveMQ Console</display-name> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <!-- Configuration of the SiteMesh Filter. --> - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <!--filter> - <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>sitemesh</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping--> - - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- Expose Spring POJOs to JSP . --> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <filter> http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/src/main/webapp/decorators/main.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/decorators/main.jsp b/activemq-web-console/src/main/webapp/decorators/main.jsp deleted file mode 100644 index 028fec2..0000000 --- a/activemq-web-console/src/main/webapp/decorators/main.jsp +++ /dev/null @@ -1,173 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>${requestContext.brokerQuery.brokerAdmin.brokerName} : <decorator:title default="ActiveMQ Console" /></title> - <style type="text/css" media="screen"> - @import url('${pageContext.request.contextPath}/styles/sorttable.css'); - @import url('${pageContext.request.contextPath}/styles/type-settings.css'); - @import url('${pageContext.request.contextPath}/styles/site.css'); - @import url('${pageContext.request.contextPath}/styles/prettify.css'); - </style> - <c:if test="${!disableJavaScript}"> - <script type='text/javascript' src='${pageContext.request.contextPath}/js/common.js'></script> - <script type='text/javascript' src='${pageContext.request.contextPath}/js/css.js'></script> - <script type='text/javascript' src='${pageContext.request.contextPath}/js/standardista-table-sorting.js'></script> - <script type='text/javascript' src='${pageContext.request.contextPath}/js/prettify.js'></script> - <script>addEvent(window, 'load', prettyPrint)</script> - </c:if> - - <decorator:head /> -</head> - -<body> - -<div class="white_box"> - <div class="header"> - <div class="header_l"> - <div class="header_r"> - </div> - </div> - </div> - <div class="content"> - <div class="content_l"> - <div class="content_r"> - - <div> - - <!-- Banner --> - <div id="asf_logo"> - <div id="activemq_logo"> - <a style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" - href="http://activemq.apache.org/"; title="The most popular and powerful open source Message Broker">ActiveMQ</a> ™ - <a style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" - href="http://www.apache.org/"; title="The Apache Software Foundation">ASF</a> - </div> - </div> - - - <div class="top_red_bar"> - <div id="site-breadcrumbs"> - <a href="<c:url value='/index.jsp'/>" title="Home">Home</a> - | - <a href="<c:url value='/queues.jsp'/>" title="Queues">Queues</a> - | - <a href="<c:url value='/topics.jsp'/>" title="Topics">Topics</a> - | - <a href="<c:url value='/subscribers.jsp'/>" title="Subscribers">Subscribers</a> - | - <a href="<c:url value='/connections.jsp'/>" title="Connections">Connections</a> - | - <a href="<c:url value='/network.jsp'/>" title="Network">Network</a> - | - <a href="<c:url value='/scheduled.jsp'/>" title="Scheduled">Scheduled</a> - | - <a href="<c:url value='/send.jsp'/>" - title="Send">Send</a> - </div> - <div id="site-quicklinks"><P> - <a href="http://activemq.apache.org/support.html"; - title="Get help and support using Apache ActiveMQ">Support</a></p> - </div> - </div> - - <table border="0"> - <tbody> - <tr> - <td valign="top" width="100%" style="overflow:hidden;"> - <div class="body-content"> - <decorator:body/> - </div> - </td> - <td valign="top"> - - <div class="navigation"> - <div class="navigation_top"> - <div class="navigation_bottom"> - <H3>Queue Views</H3> - - <ul class="alternate" type="square"> - - - - <li><a href="queueGraph.jsp" title="View the queue depths as a graph">Graph</a></li> - <li><a href="xml/queues.jsp" title="View the queues as XML">XML</a></li> - </ul> - <H3>Topic Views</H3> - - <ul class="alternate" type="square"> - - - - <li><a href="xml/topics.jsp" title="View the topics as XML">XML</a></li> - </ul> - <H3>Subscribers Views</H3> - - <ul class="alternate" type="square"> - - - - <li><a href="xml/subscribers.jsp" title="View the subscribers as XML">XML</a></li> - </ul> - <H3>Useful Links</H3> - - <ul class="alternate" type="square"> - <li><a href="http://activemq.apache.org/"; - title="The most popular and powerful open source Message Broker">Documentation</a></li> - <li><a href="http://activemq.apache.org/faq.html";>FAQ</a></li> - <li><a href="http://activemq.apache.org/download.html";>Downloads</a> - </li> - <li><a href="http://activemq.apache.org/discussion-forums.html";>Forums</a> - </li> - </ul> - </div> - </div> - </div> - </td> - </tr> - </tbody> - </table> - - - <div class="bottom_red_bar"></div> - </div> - </div> - </div> - </div> - <div class="black_box"> - <div class="footer"> - <div class="footer_l"> - <div class="footer_r"> - <div> - Copyright 2005-2013 The Apache Software Foundation. - - (<a href="?printable=true">printable version</a>) - </div> - </div> - </div> - </div> - </div> -</div> -<div class="design_attribution"><a href="http://hiramchirino.com/";>Graphic Design By Hiram</a></div> - -</body> -</html> - http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/src/main/webapp/decorators/panel.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/decorators/panel.jsp b/activemq-web-console/src/main/webapp/decorators/panel.jsp deleted file mode 100644 index 3470e1b..0000000 --- a/activemq-web-console/src/main/webapp/decorators/panel.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator"; prefix="decorator" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<p> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <th class="panelTitle"> - <decorator:title default="Unknown panel" /> - </th> - </tr> - <tr> - <td class="panelBody"> - <decorator:body /> - </td> - </tr> - </table> -</p> http://git-wip-us.apache.org/repos/asf/activemq/blob/cbc227cd/activemq-web-console/src/main/webapp/decorators/printable.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/decorators/printable.jsp b/activemq-web-console/src/main/webapp/decorators/printable.jsp deleted file mode 100644 index 84659a0..0000000 --- a/activemq-web-console/src/main/webapp/decorators/printable.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator"; prefix="decorator" %> -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - -<html> - <head> - <title><decorator:title default="Welcome!" /></title> - <decorator:head /> - </head> - - <body onload="window.print();"> - Printed on <%=new java.util.Date()%>.<br/> - <hr noshade="noshade" size="1"/> - <br/> - <decorator:body /> - </body> -</html>
