You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/06/25 10:10:24 UTC
svn commit: r957836 - in
/felix/trunk/webconsole/src/main/resources/templates: components.html
config.html deployment.html license.html logs.html obr.html services.html
shell.html vmstat.html vmstat_restart.html vmstat_stop.html
Author: fmeschbe
Date: Fri Jun 25 08:10:24 2010
New Revision: 957836
URL: http://svn.apache.org/viewvc?rev=957836&view=rev
Log:
FELIX-2447 Ensure loading script resources with an absolute path to prevent resource loading failure for detail pages such as /system/console/services/15.
Modified:
felix/trunk/webconsole/src/main/resources/templates/components.html
felix/trunk/webconsole/src/main/resources/templates/config.html
felix/trunk/webconsole/src/main/resources/templates/deployment.html
felix/trunk/webconsole/src/main/resources/templates/license.html
felix/trunk/webconsole/src/main/resources/templates/logs.html
felix/trunk/webconsole/src/main/resources/templates/obr.html
felix/trunk/webconsole/src/main/resources/templates/services.html
felix/trunk/webconsole/src/main/resources/templates/shell.html
felix/trunk/webconsole/src/main/resources/templates/vmstat.html
felix/trunk/webconsole/src/main/resources/templates/vmstat_restart.html
felix/trunk/webconsole/src/main/resources/templates/vmstat_stop.html
Modified: felix/trunk/webconsole/src/main/resources/templates/components.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/components.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/components.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/components.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/components.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/components.js"></script>
<script type="text/javascript">
// <![CDATA[
var drawDetails = ${__drawDetails__};
Modified: felix/trunk/webconsole/src/main/resources/templates/config.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/config.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/config.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/config.js"></script>
<script type="text/javascript">
// <![CDATA[
// data
Modified: felix/trunk/webconsole/src/main/resources/templates/deployment.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/deployment.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/deployment.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/deployment.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/deployment.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/deployment.js"></script>
<script type="text/javascript">
// <![CDATA[
var i18n = {
Modified: felix/trunk/webconsole/src/main/resources/templates/license.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/license.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/license.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/license.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/license.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/license.js"></script>
<script type="text/javascript">
// <![CDATA[
var bundleData = ${__data__};
Modified: felix/trunk/webconsole/src/main/resources/templates/logs.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/logs.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/logs.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/logs.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/logs.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/logs.js"></script>
<script type="text/javascript">
// <![CDATA[
// i18n
Modified: felix/trunk/webconsole/src/main/resources/templates/obr.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/obr.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/obr.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/obr.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="${pluginRoot}/res/ui/obr.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/obr.js"></script>
<script type="text/javascript">
var i18n = {
status_ok : '${obr.status.ok}',
Modified: felix/trunk/webconsole/src/main/resources/templates/services.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/services.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/services.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/services.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/services.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/services.js"></script>
<script type="text/javascript">
// <![CDATA[
// i18n stuff
Modified: felix/trunk/webconsole/src/main/resources/templates/shell.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/shell.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/shell.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/shell.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/shell.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/shell.js"></script>
<script type="text/javascript">
// <![CDATA[
var shellDisabled = ${shell.disabled};
Modified: felix/trunk/webconsole/src/main/resources/templates/vmstat.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/vmstat.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/vmstat.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/vmstat.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/vmstat.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/vmstat.js"></script>
<script type="text/javascript">
// <![CDATA[
var statData = ${startData};
Modified: felix/trunk/webconsole/src/main/resources/templates/vmstat_restart.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/vmstat_restart.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/vmstat_restart.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/vmstat_restart.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/vmstat.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/vmstat.js"></script>
<!-- status line -->
<p class="statline">${vmstat.restarting}</p>
Modified: felix/trunk/webconsole/src/main/resources/templates/vmstat_stop.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/vmstat_stop.html?rev=957836&r1=957835&r2=957836&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/vmstat_stop.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/vmstat_stop.html [UTF-8] Fri Jun 25 08:10:24 2010
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="res/ui/vmstat.js"></script>
+<script type="text/javascript" src="${appRoot}/res/ui/vmstat.js"></script>
<!-- status line -->
<p class="statline">${vmstat.stopped}</p>