You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/08/13 19:13:51 UTC
svn commit: r565428 - in
/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view:
ajax/progressbar.jsp infomanager/svrInfoNormal.jsp keystore/index.jsp
welcome/welcomeNormal.jsp
Author: pmcmahan
Date: Mon Aug 13 10:13:50 2007
New Revision: 565428
URL: http://svn.apache.org/viewvc?view=rev&rev=565428
Log:
GERONIMO-3345 reenable DWR using /console context. fix image and portlet paths in welcome page.
Modified:
geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp?view=diff&rev=565428&r1=565427&r2=565428
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp Mon Aug 13 10:13:50 2007
@@ -16,9 +16,9 @@
--%>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<script type='text/javascript' src='/pluto/dwr/interface/ProgressMonitor.js'></script>
-<script type='text/javascript' src='/pluto/dwr/engine.js'></script>
-<script type='text/javascript' src='/pluto/dwr/util.js'></script>
+<script type='text/javascript' src='/console/dwr/interface/ProgressMonitor.js'></script>
+<script type='text/javascript' src='/console/dwr/engine.js'></script>
+<script type='text/javascript' src='/console/dwr/util.js'></script>
<script type="text/javascript">
dwr.engine.setErrorHandler(<portlet:namespace/>onError);
Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?view=diff&rev=565428&r1=565427&r2=565428
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Mon Aug 13 10:13:50 2007
@@ -19,9 +19,9 @@
<portlet:defineObjects/>
-<script type='text/javascript' src='/pluto/dwr/interface/Jsr77Stats.js'></script>
-<script type='text/javascript' src='/pluto/dwr/engine.js'></script>
-<script type='text/javascript' src='/pluto/dwr/util.js'></script>
+<script type='text/javascript' src='/console/dwr/interface/Jsr77Stats.js'></script>
+<script type='text/javascript' src='/console/dwr/engine.js'></script>
+<script type='text/javascript' src='/console/dwr/util.js'></script>
<table width="100%">
<tr>
Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp?view=diff&rev=565428&r1=565427&r2=565428
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp Mon Aug 13 10:13:50 2007
@@ -81,13 +81,13 @@
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="unlockEdit-before" />
<portlet:param name="keystore" value="${keystore.name}" />
- </portlet:actionURL>"><img src="/pluto/images/ico_lock_16x16.gif" alt="Locked" /></a>
+ </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt="Locked" /></a>
</c:when>
<c:otherwise>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="lockEdit-before" />
<portlet:param name="keystore" value="${keystore.name}" />
- </portlet:actionURL>"><img src="/pluto/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+ </portlet:actionURL>"><img src="/console/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
</c:otherwise>
</c:choose>
</td>
@@ -97,13 +97,13 @@
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="unlockKeystore-before" />
<portlet:param name="keystore" value="${keystore.name}" />
- </portlet:actionURL>"><img src="/pluto/images/ico_lock_16x16.gif" alt="Locked" /></a>
+ </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt="Locked" /></a>
</c:when>
<c:otherwise>
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="lockKeystore-before" />
<portlet:param name="keystore" value="${keystore.name}" />
- </portlet:actionURL> "onClick="return confirm('This keystore is currently in use. Locking it may prevent the server from starting. Continue?');" ><img src="/pluto/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+ </portlet:actionURL> "onClick="return confirm('This keystore is currently in use. Locking it may prevent the server from starting. Continue?');" ><img src="/console/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
${keys[keystore.name]}
</c:otherwise>
</c:choose>
Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?view=diff&rev=565428&r1=565427&r2=565428
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Mon Aug 13 10:13:50 2007
@@ -71,9 +71,9 @@
<tr>
<td bgcolor="#FFFFFF" nowrap>
<br />
- <img src='/pluto/images/ico_list_16x16.gif' alt=""/><a href="/pluto/portal/Applications/Deploy New">Deploy New Applications</a><br />
- <img src='/pluto/images/ico_servcomp_16x16.gif' alt=""/><a href="/pluto/portal/Server/Web Server">Web Server Ports</a><br />
- <img src='/pluto/images/ico_look_16x16.gif' alt=""/><a href="/pluto/portal/Server/Information">Server Information</a><br />
+ <img src='/console/images/ico_list_16x16.gif' alt=""/><a href="/console/portal/Applications/Deploy New">Deploy New Applications</a><br />
+ <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a href="/console/portal/Server/Web Server">Web Server Ports</a><br />
+ <img src='/console/images/ico_look_16x16.gif' alt=""/><a href="/console/portal/Server/Information">Server Information</a><br />
<br />
</td>
</tr>
@@ -126,7 +126,7 @@
<br />
<p align="right"><font size=-1>
- <img src="/pluto/images/powered_by_100x30.gif" alt="Powered by Apache Geronimo"/>
+ <img src="/console/images/powered_by_100x30.gif" alt="Powered by Apache Geronimo"/>
</font><br />
<font size=-1>Copyright © 1999-2007 Apache Software Foundation</font><br />