You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2012/07/13 11:56:29 UTC
svn commit: r1361132 - in /activemq/trunk/activemq-web-console: pom.xml
src/main/webapp/decorators/main.jsp
Author: dejanb
Date: Fri Jul 13 09:56:29 2012
New Revision: 1361132
URL: http://svn.apache.org/viewvc?rev=1361132&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi don't load css on a first page load
Modified:
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1361132&r1=1361131&r2=1361132&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Fri Jul 13 09:56:29 2012
@@ -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>
Modified: activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp?rev=1361132&r1=1361131&r2=1361132&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp Fri Jul 13 09:56:29 2012
@@ -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>