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

https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi don't load css on a first page load 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361132 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2012-07-13 09:56:29 +00:00
parent db1f6fe2b4
commit 1cd533078a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-web-console/pom.xml
View File

@ -40,7 +40,8 @@
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>
WEB-INF/lib/jetty*.jar,
WEB-INF/lib/servlet*.jar
WEB-INF/lib/servlet*.jar,
WEB-INF/lib/jstl*.jar
</packagingExcludes>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@ -128,7 +129,9 @@
javax.management.remote,
javax.naming,
org.w3c.dom,
javax.servlet*,
javax.servlet,
javax.servlet.http,
javax.servlet.resources,
javax.servlet.jsp,
javax.servlet.jsp.tagext,
javax.servlet.jsp.el,
@ -276,10 +279,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<scope>provided</scope>
</dependency>

16
activemq-web-console/src/main/webapp/decorators/main.jsp
View File

@ -21,16 +21,16 @@
<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(<c:url value="/styles/sorttable.css"/>);
@import url(<c:url value="/styles/type-settings.css"/>);
@import url(<c:url value="/styles/site.css"/>);
@import url(<c:url value="/styles/prettify.css"/>);
@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='<c:url value="/js/common.js"/>'></script>
<script type='text/javascript' src='<c:url value="/js/css.js"/>'></script>
<script type='text/javascript' src='<c:url value="/js/standardista-table-sorting.js"/>'></script>
<script type='text/javascript' src='<c:url value="/js/prettify.js"/>'></script>
<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>