Merge ../activemq into remove-sitemesh

This commit is contained in:
Daniel Kulp 2014-02-03 15:23:54 -05:00
commit f74a65f4f5
8 changed files with 0 additions and 282 deletions

View File

@ -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>

View File

@ -27,7 +27,6 @@
</description>
<display-name>ActiveMQ Console</display-name>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Expose Spring POJOs to JSP . -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

View File

@ -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> &trade;
<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>
&#124;
<a href="<c:url value='/queues.jsp'/>" title="Queues">Queues</a>
&#124;
<a href="<c:url value='/topics.jsp'/>" title="Topics">Topics</a>
&#124;
<a href="<c:url value='/subscribers.jsp'/>" title="Subscribers">Subscribers</a>
&#124;
<a href="<c:url value='/connections.jsp'/>" title="Connections">Connections</a>
&#124;
<a href="<c:url value='/network.jsp'/>" title="Network">Network</a>
&#124;
<a href="<c:url value='/scheduled.jsp'/>" title="Scheduled">Scheduled</a>
&#124;
<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>

View File

@ -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>

View File

@ -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>

View File

@ -353,10 +353,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>

View File

@ -252,9 +252,6 @@
<include>org.mortbay.jetty:jsp-api-2.1-glassfish</include>
<include>org.eclipse.jdt:core</include>
<!-- JSTL and other web stuff -->
<include>opensymphony:sitemesh</include>
<!-- Atom/RSS support -->
<include>rome:rome</include>
<include>jdom:jdom</include>

View File

@ -92,7 +92,6 @@
<log4j-version>1.2.17</log4j-version>
<mqtt-client-version>1.7</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version>
<opensymphony-version>2.4.2</opensymphony-version>
<org-apache-derby-version>10.10.1.1</org-apache-derby-version>
<org.osgi.core-version>4.3.1</org.osgi.core-version>
<p2psockets-version>1.1.2</p2psockets-version>
@ -1039,11 +1038,6 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
<version>${opensymphony-version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>