You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/06/12 22:08:20 UTC
svn commit: r413736 - in /incubator/roller/branches/roller_3.0:
metadata/xdoclet/ src/org/apache/roller/ui/admin/struts/actions/
src/org/apache/roller/ui/authoring/struts/actions/ web/WEB-INF/
web/WEB-INF/jsps/admin/ web/WEB-INF/jsps/authoring/
Author: agilliland
Date: Mon Jun 12 13:08:19 2006
New Revision: 413736
URL: http://svn.apache.org/viewvc?rev=413736&view=rev
Log:
move /admin/* struts actions to /roller-ui/admin/*
Modified:
incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargets.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetConfig.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetGroups.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml
Modified: incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml Mon Jun 12 13:08:19 2006
@@ -51,20 +51,20 @@
<!-- global admin actions -->
-<forward name="rollerConfig" path="/admin/rollerConfig.do?method=edit"/>
-<forward name="adminUser" path="/admin/user.do?method=edit"/>
-<forward name="commentManagementGlobal" path="/admin/commentManagement.do?method=query"/>
-<forward name="commentQueryGlobal" path="/admin/commentQuery.do?method=query"/>
-<forward name="addUser" path="/admin/user.do?method=add"/>
-<forward name="commonPingTargets" path="/admin/commonPingTargets.do"/>
-<forward name="cacheInfo" path="/admin/cacheInfo.do"/>
+<forward name="rollerConfig" path="/roller-ui/admin/rollerConfig.do?method=edit"/>
+<forward name="adminUser" path="/roller-ui/admin/user.do?method=edit"/>
+<forward name="commentManagementGlobal" path="/roller-ui/admin/commentManagement.do?method=query"/>
+<forward name="commentQueryGlobal" path="/roller-ui/admin/commentQuery.do?method=query"/>
+<forward name="addUser" path="/roller-ui/admin/user.do?method=add"/>
+<forward name="commonPingTargets" path="/roller-ui/admin/commonPingTargets.do"/>
+<forward name="cacheInfo" path="/roller-ui/admin/cacheInfo.do"/>
<!-- planet admin actions -->
-<forward name="planetConfig" path="/admin/planetConfig.do?method=getConfig"/>
-<forward name="planetSubscriptions" path="/admin/planetSubscriptions.do?method=getSubscriptions"/>
-<forward name="planetGroups" path="/admin/planetGroups.do?method=getGroups"/>
-<forward name="planetGroupSubscriptions" path="/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions"/>
+<forward name="planetConfig" path="/roller-ui/admin/planetConfig.do?method=getConfig"/>
+<forward name="planetSubscriptions" path="/roller-ui/admin/planetSubscriptions.do?method=getSubscriptions"/>
+<forward name="planetGroups" path="/roller-ui/admin/planetGroups.do?method=getGroups"/>
+<forward name="planetGroupSubscriptions" path="/roller-ui/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions"/>
</global-forwards>
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java Mon Jun 12 13:08:19 2006
@@ -43,7 +43,7 @@
/**
* Struts Action class which handles requests to the System Info page.
*
- * @struts.action path="/admin/cacheInfo" scope="request" parameter="method"
+ * @struts.action path="/roller-ui/admin/cacheInfo" scope="request" parameter="method"
*
* @struts.action-forward name="cacheInfo.page" path=".cacheInfo"
*
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java Mon Jun 12 13:08:19 2006
@@ -42,7 +42,7 @@
* Administer common ping targets.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @struts.action name="pingTargetForm" path="/admin/commonPingTargets" scope="request" parameter="method"
+ * @struts.action name="pingTargetForm" path="/roller-ui/admin/commonPingTargets" scope="request" parameter="method"
* @struts.action-forward name="pingTargets.page" path=".CommonPingTargets"
* @struts.action-forward name="pingTargetEdit.page" path=".CommonPingTargetEdit"
* @struts.action-forward name="pingTargetDeleteOK.page" path=".CommonPingTargetDeleteOK"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java Mon Jun 12 13:08:19 2006
@@ -47,7 +47,7 @@
/**
* Allows configuration of Planet Roller.
*
- * @struts.action name="planetConfigForm" path="/admin/planetConfig"
+ * @struts.action name="planetConfigForm" path="/roller-ui/admin/planetConfig"
* scope="request" parameter="method"
*
* @struts.action-forward name="planetConfig.page"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java Mon Jun 12 13:08:19 2006
@@ -49,7 +49,7 @@
/**
* Add, remove, and view user defined groups.
*
- * @struts.action name="planetGroupForm" path="/admin/planetGroups"
+ * @struts.action name="planetGroupForm" path="/roller-ui/admin/planetGroups"
* scope="request" parameter="method"
*
* @struts.action-forward name="planetGroups.page"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java Mon Jun 12 13:08:19 2006
@@ -53,7 +53,7 @@
* Add, remove, and view existing subscriptions in a group.
* If no group is specified via the groupHandle parameter, then uses "external".
*
- * @struts.action name="planetSubscriptionFormEx" path="/admin/planetSubscriptions"
+ * @struts.action name="planetSubscriptionFormEx" path="/roller-ui/admin/planetSubscriptions"
* scope="request" parameter="method"
*
* @struts.action-forward name="planetSubscriptions.page"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java Mon Jun 12 13:08:19 2006
@@ -58,7 +58,7 @@
*
* @author Allen Gilliland
*
- * @struts.action path="/admin/rollerConfig"
+ * @struts.action path="/roller-ui/admin/rollerConfig"
* scope="request" parameter="method"
*
* @struts.action-forward name="rollerProperties.page"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java Mon Jun 12 13:08:19 2006
@@ -54,7 +54,7 @@
/**
* Actions for administering a user allow user query, edit, and delete of users.
*
- * @struts.action name="userAdminForm" path="/admin/user"
+ * @struts.action name="userAdminForm" path="/roller-ui/admin/user"
* scope="request" parameter="method"
*
* @struts.action-forward name="adminUser.page" path=".UserAdmin"
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java Mon Jun 12 13:08:19 2006
@@ -61,10 +61,10 @@
* @struts.action path="/roller-ui/authoring/commentQuery" name="commentQueryForm"
* scope="request" parameter="method"
*
- * @struts.action path="/admin/commentManagement" name="commentManagementForm"
+ * @struts.action path="/roller-ui/admin/commentManagement" name="commentManagementForm"
* scope="request" parameter="method"
*
- * @struts.action path="/admin/commentQuery" name="commentQueryForm"
+ * @struts.action path="/roller-ui/admin/commentQuery" name="commentQueryForm"
* scope="request" parameter="method"
*
* @struts.action-forward name="commentManagement.page" path=".CommentManagement"
@@ -376,7 +376,7 @@
sb.append("&weblog=");
sb.append(getWebsite().getHandle());
} else {
- sb.append("/admin/commentManagement.do"); // TODO: get path from Struts
+ sb.append("/roller-ui/admin/commentManagement.do"); // TODO: get path from Struts
sb.append("?method=query");
}
sb.append("&count=");
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp Mon Jun 12 13:08:19 2006
@@ -32,7 +32,7 @@
<table>
<tr>
<td>
-<html:form action="/admin/commonPingTargets" method="post">
+<html:form action="/roller-ui/admin/commonPingTargets" method="post">
<html:hidden property="method" value="deleteConfirmed" />
<html:hidden property="id" />
<div class="control">
@@ -41,7 +41,7 @@
</html:form>
</td>
<td>
-<html:form action="/admin/commonPingTargets" method="post">
+<html:form action="/roller-ui/admin/commonPingTargets" method="post">
<!-- Results in returning to the view on common ping targets. -->
<div class="control">
<input type="submit" value='<fmt:message key="pingTarget.cancel" />' />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp Mon Jun 12 13:08:19 2006
@@ -22,7 +22,7 @@
<fmt:message key="commonPingTarget.subtitle"/>
</p>
-<html:form action="/admin/commonPingTargets" method="post" focus="name">
+<html:form action="/roller-ui/admin/commonPingTargets" method="post" focus="name">
<html:hidden property="method" value="save" />
<html:hidden property="id" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargets.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargets.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/CommonPingTargets.jsp Mon Jun 12 13:08:19 2006
@@ -63,7 +63,7 @@
<td class="rollertable" align="center" >
<c:choose>
<c:when test="${pingTarget.autoEnabled}">
- <roller:link page="/admin/commonPingTargets.do">
+ <roller:link page="/roller-ui/admin/commonPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -73,7 +73,7 @@
</roller:link>
</c:when>
<c:otherwise >
- <roller:link page="/admin/commonPingTargets.do">
+ <roller:link page="/roller-ui/admin/commonPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -86,7 +86,7 @@
</td>
<td class="rollertable" align="center">
- <roller:link page="/admin/commonPingTargets.do">
+ <roller:link page="/roller-ui/admin/commonPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -98,7 +98,7 @@
</td>
<td class="rollertable" align="center">
- <roller:link page="/admin/commonPingTargets.do">
+ <roller:link page="/roller-ui/admin/commonPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -115,7 +115,7 @@
</table>
<p/>
-<html:form action="/admin/commonPingTargets" method="post">
+<html:form action="/roller-ui/admin/commonPingTargets" method="post">
<div class="control">
<html:hidden property="method" value="addNew" />
<input type="submit" value='<fmt:message key="pingTarget.addNew"/>' />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetConfig.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetConfig.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetConfig.jsp Mon Jun 12 13:08:19 2006
@@ -31,7 +31,7 @@
// -->
</script>
-<html:form action="/admin/planetConfig" method="post">
+<html:form action="/roller-ui/admin/planetConfig" method="post">
<html:hidden property="method" value="saveConfig" />
<html:hidden property="id" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetGroups.jsp Mon Jun 12 13:08:19 2006
@@ -43,7 +43,7 @@
</c:if>
</p>
- <html:form action="/admin/planetGroups" method="post">
+ <html:form action="/roller-ui/admin/planetGroups" method="post">
<html:hidden property="method" value="saveGroup" />
<html:hidden property="id" />
@@ -114,7 +114,7 @@
</td>
<td class="rollertable">
- <roller:link page="/admin/planetGroups.do">
+ <roller:link page="/roller-ui/admin/planetGroups.do">
<roller:linkparam
id="method" value="getGroups" />
<roller:linkparam
@@ -125,7 +125,7 @@
</td>
<td class="rollertable">
- <roller:link page="/admin/planetSubscriptions.do">
+ <roller:link page="/roller-ui/admin/planetSubscriptions.do">
<roller:linkparam
id="method" value="getSubscriptions" />
<roller:linkparam
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Mon Jun 12 13:08:19 2006
@@ -58,7 +58,7 @@
</c:when>
</c:choose>
- <html:form action="/admin/planetSubscriptions" method="post">
+ <html:form action="/roller-ui/admin/planetSubscriptions" method="post">
<html:hidden property="method" value="saveSubscription" />
<html:hidden property="id" />
<html:hidden property="groupHandle" />
@@ -142,7 +142,7 @@
</td>
<td class="rollertable">
- <roller:link page="/admin/planetSubscriptions.do">
+ <roller:link page="/roller-ui/admin/planetSubscriptions.do">
<roller:linkparam
id="method" value="getSubscriptions" />
<roller:linkparam
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp Mon Jun 12 13:08:19 2006
@@ -32,7 +32,7 @@
<p class="subtitle"><fmt:message key="userAdmin.subtitle.searchUser" /></p>
<p><fmt:message key="userAdmin.prompt.searchUser" /></p>
- <html:form action="/admin/user" method="post" focus="userName">
+ <html:form action="/roller-ui/admin/user" method="post" focus="userName">
<input name="method" type="hidden" value="edit" />
<span style="margin:4px"><fmt:message key="inviteMember.userName" /></span>
@@ -49,7 +49,7 @@
<p class="subtitle"><fmt:message key="userAdmin.subtitle.userCreation" /></p>
<fmt:message key="userAdmin.prompt.orYouCan" />
- <c:url value="/admin/user.do" var="newUser">
+ <c:url value="/roller-ui/admin/user.do" var="newUser">
<c:param name="method" value="newUser" />
</c:url>
<a href='<c:out value="${newUser}" />'>
@@ -74,7 +74,7 @@
</c:otherwise>
</c:choose>
- <html:form action="/admin/user" method="post">
+ <html:form action="/roller-ui/admin/user" method="post">
<html:hidden property="method" value="update"/></input>
<html:hidden property="id"/></input>
<html:hidden property="adminCreated" /></input>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp Mon Jun 12 13:08:19 2006
@@ -160,7 +160,7 @@
<%-- ============================================================= --%>
<% String path = model.getWebsite()==null
- ? "/admin/commentManagement" : "/roller-ui/authoring/commentManagement"; %>
+ ? "/roller-ui/admin/commentManagement" : "/roller-ui/authoring/commentManagement"; %>
<html:form action="<%= path %>" method="post">
<input type="hidden" name="method" value="update"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp Mon Jun 12 13:08:19 2006
@@ -34,7 +34,7 @@
<p><fmt:message key="commentManagement.sidebarDescription" /></p>
<% String path = model.getWebsite()==null
- ? "/admin/commentQuery" : "/roller-ui/authoring/commentQuery"; %>
+ ? "/roller-ui/admin/commentQuery" : "/roller-ui/authoring/commentQuery"; %>
<html:form action="<%= path %>" method="post">
<c:if test="${!empty model.website}">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml?rev=413736&r1=413735&r2=413736&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml Mon Jun 12 13:08:19 2006
@@ -44,7 +44,7 @@
<value>
PATTERN_TYPE_APACHE_ANT
/roller-ui/authoring/**=admin,editor
- /admin/**=admin
+ /roller-ui/admin/**=admin
/rewrite-status*=admin
/roller-ui/login-redirect.jsp=admin,editor
</value>