roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r413725 [1/3] - in /incubator/roller/branches/roller_3.0: metadata/xdoclet/ src/org/apache/roller/ui/authoring/ajax/ src/org/apache/roller/ui/authoring/struts/actions/ src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/ web/WEB-INF/cl...
Date Mon, 12 Jun 2006 18:49:29 GMT
Author: agilliland
Date: Mon Jun 12 11:49:26 2006
New Revision: 413725

URL: http://svn.apache.org/viewvc?rev=413725&view=rev
Log:
moving all the old /editor/* struts actions to /roller-ui/authoring/*


Modified:
    incubator/roller/branches/roller_3.0/metadata/xdoclet/global-forwards.xml
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/UserAdmin.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarkForm.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryForm.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/jsps/authoring/CreateWebsite.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/FolderForm.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Maintenance.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissions.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Pings.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/UploadFile.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourProfile.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourWebsites.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/bake-weblog.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/export-entries.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import-entries.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/referers.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/remove-page.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp
    incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml
    incubator/roller/branches/roller_3.0/web/roller-ui/authoring/editors/editor-dhtml.jsp
    incubator/roller/branches/roller_3.0/web/roller-ui/login-redirect.jsp
    incubator/roller/branches/roller_3.0/web/roller-ui/scripts/ajax-user.js

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=413725&r1=413724&r2=413725&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 11:49:26 2006
@@ -14,39 +14,40 @@
 
 <!--  landing page actions -->
 
-<forward name="yourProfile"            path="/editor/yourProfile.do?method=edit" />
-<forward name="yourWebsites"           path="/editor/yourWebsites.do?method=edit" />
-<forward name="createWebsite"          path="/editor/createWebsite.do?method=create" />
+<forward name="yourProfile"            path="/roller-ui/authoring/yourProfile.do?method=edit" />
+<forward name="yourWebsites"           path="/roller-ui/authoring/yourWebsites.do?method=edit" />
+<forward name="createWebsite"          path="/roller-ui/authoring/createWebsite.do?method=create" />
 
 <!--  editor/author actions -->
 
-<forward name="weblogEdit"             path="/editor/weblog.do?method=edit"/>
-<forward name="weblogCreate"           path="/editor/weblog.do?method=create"/>
-<forward name="weblogEntryManagement"  path="/editor/weblogEntryManagement.do?method=query"/>
-<forward name="commentManagement"      path="/editor/commentManagement.do?method=query"/>
-<forward name="commentQuery"           path="/editor/commentQuery.do?method=query"/>
-<forward name="categories"             path="/editor/categories.do?method=selectCategory"/>
-<forward name="bookmarks"              path="/editor/bookmarks.do?method=selectFolder"/>
-<forward name="importBookmarks"        path="/editor/importBookmarks.do"/>
-<forward name="uploadFiles"            path="/editor/uploadFiles.do"/>
-<forward name="referers"               path="/editor/referers.do"/>
+<forward name="weblogEdit"             path="/roller-ui/authoring/weblog.do?method=edit"/>
+<forward name="weblogCreate"           path="/roller-ui/authoring/weblog.do?method=create"/>
+<forward name="weblogEntryManagement"  path="/roller-ui/authoring/weblogEntryManagement.do?method=query"/>
+<forward name="commentManagement"      path="/roller-ui/authoring/commentManagement.do?method=query"/>
+<forward name="commentQuery"           path="/roller-ui/authoring/commentQuery.do?method=query"/>
+<forward name="categories"             path="/roller-ui/authoring/categories.do?method=selectCategory"/>
+<forward name="bookmarks"              path="/roller-ui/authoring/bookmarks.do?method=selectFolder"/>
+<forward name="folderEdit"             path="/roller-ui/authoring/folderEdit.do"/>
+<forward name="importBookmarks"        path="/roller-ui/authoring/importBookmarks.do"/>
+<forward name="uploadFiles"            path="/roller-ui/authoring/uploadFiles.do"/>
+<forward name="referers"               path="/roller-ui/authoring/referers.do"/>
 
 <!-- manage weblog actions -->
 
-<forward name="editWebsite"            path="/editor/website.do?method=edit"/>
-<forward name="editTheme"              path="/editor/themeEditor.do?method=edit"/>
-<forward name="editPages"              path="/editor/page.do?method=editPages"/>
-<forward name="editPage"               path="/editor/page.do?method=edit"/>
-<forward name="removePage"             path="/editor/page.do?method=remove"/>
-<forward name="removePage.ok"          path="/editor/page.do?method=removeOk"/>
-<forward name="memberPermissions"      path="/editor/memberPermissions.do" />
-<forward name="inviteMember"           path="/editor/inviteMember.do" />
-<forward name="pingSetup"              path="/editor/pingSetup.do" />
-<forward name="customPingTargets"      path="/editor/customPingTargets.do" />
-<forward name="maintenance"            path="/editor/maintenance.do" />
+<forward name="editWebsite"            path="/roller-ui/authoring/website.do?method=edit"/>
+<forward name="editTheme"              path="/roller-ui/authoring/themeEditor.do?method=edit"/>
+<forward name="editPages"              path="/roller-ui/authoring/page.do?method=editPages"/>
+<forward name="editPage"               path="/roller-ui/authoring/page.do?method=edit"/>
+<forward name="removePage"             path="/roller-ui/authoring/page.do?method=remove"/>
+<forward name="removePage.ok"          path="/roller-ui/authoring/page.do?method=removeOk"/>
+<forward name="memberPermissions"      path="/roller-ui/authoring/memberPermissions.do" />
+<forward name="inviteMember"           path="/roller-ui/authoring/inviteMember.do" />
+<forward name="pingSetup"              path="/roller-ui/authoring/pingSetup.do" />
+<forward name="customPingTargets"      path="/roller-ui/authoring/customPingTargets.do" />
+<forward name="maintenance"            path="/roller-ui/authoring/maintenance.do" />
 
-<forward name="trackback"              path="/editor/trackback.do?method=send"/>
-<forward name="toggleLinkback"         path="/editor/toggleLinkback.do"/>
+<forward name="trackback"              path="/roller-ui/authoring/trackback.do?method=send"/>
+<forward name="toggleLinkback"         path="/roller-ui/authoring/toggleLinkback.do"/>
 
 <!-- global admin actions -->
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java Mon Jun 12 11:49:26 2006
@@ -46,7 +46,7 @@
  *     usernameN, emailaddressN <br/>
  * 
  * @web.servlet name="UserDataServlet" 
- * @web.servlet-mapping url-pattern="/editor/userdata/*"
+ * @web.servlet-mapping url-pattern="/roller-ui/authoring/userdata/*"
  * @author David M Johnson
  */
 public class UserDataServlet extends HttpServlet {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java Mon Jun 12 11:49:26 2006
@@ -40,7 +40,7 @@
 import org.apache.roller.ui.authoring.struts.formbeans.BookmarkFormEx;
 
 /**
- * @struts.action path="/editor/bookmarkEdit" name="bookmarkFormEx" validate="false"
+ * @struts.action path="/roller-ui/authoring/bookmarkEdit" name="bookmarkFormEx" validate="false"
  * @struts.action-forward name="BookmarkForm" path=".BookmarkForm"
  * 
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java Mon Jun 12 11:49:26 2006
@@ -40,9 +40,9 @@
 import org.apache.roller.util.cache.CacheManager;
 
 /**
- * @struts.action path="/editor/bookmarkSave" name="bookmarkFormEx"
- *    validate="true" input="/editor/bookmarkEdit.do"
- * @struts.action-forward name="Bookmarks" path="/editor/bookmarks.do?method=selectFolder"
+ * @struts.action path="/roller-ui/authoring/bookmarkSave" name="bookmarkFormEx"
+ *    validate="true" input="/roller-ui/authoring/bookmarkEdit.do"
+ * @struts.action-forward name="Bookmarks" path="/roller-ui/authoring/bookmarks.do?method=selectFolder"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java Mon Jun 12 11:49:26 2006
@@ -57,7 +57,7 @@
 /**
  * Actions that are initiated from the BookmarksForm.
  *
- * @struts.action name="bookmarksForm" path="/editor/bookmarks" parameter="method"
+ * @struts.action name="bookmarksForm" path="/roller-ui/authoring/bookmarks" parameter="method"
  * @struts.action-forward name="BookmarksForm" path=".BookmarksForm"
  *
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java Mon Jun 12 11:49:26 2006
@@ -55,7 +55,7 @@
 /**
  * Actions that are initiated from the CategoriesForm.
  * 
- * @struts.action name="categoriesForm" path="/editor/categories" parameter="method"
+ * @struts.action name="categoriesForm" path="/roller-ui/authoring/categories" parameter="method"
  * @struts.action-forward name="CategoriesForm" path=".CategoriesForm"
  * 
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java Mon Jun 12 11:49:26 2006
@@ -41,7 +41,7 @@
 import org.apache.roller.ui.authoring.struts.formbeans.CategoryDeleteForm;
 
 /**
- * @struts.action path="/editor/categoryDelete" name="categoryDeleteForm"
+ * @struts.action path="/roller-ui/authoring/categoryDelete" name="categoryDeleteForm"
  * @struts.action-forward name="CategoryDeleteOK" path=".CategoryDeleteOK"
  *
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java Mon Jun 12 11:49:26 2006
@@ -39,7 +39,7 @@
 import org.apache.roller.ui.authoring.struts.formbeans.WeblogCategoryFormEx;
 
 /**
- * @struts.action path="/editor/categoryEdit" name="weblogCategoryFormEx" validate="false"
+ * @struts.action path="/roller-ui/authoring/categoryEdit" name="weblogCategoryFormEx" validate="false"
  * @struts.action-forward name="CategoryForm" path=".CategoryForm"
  * 
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java Mon Jun 12 11:49:26 2006
@@ -39,8 +39,8 @@
 import org.apache.roller.ui.authoring.struts.formbeans.WeblogCategoryFormEx;
 
 /**
- * @struts.action path="/editor/categorySave" name="weblogCategoryFormEx"
- *    validate="true" input="/editor/categoryEdit.do"
+ * @struts.action path="/roller-ui/authoring/categorySave" name="weblogCategoryFormEx"
+ *    validate="true" input="/roller-ui/authoring/categoryEdit.do"
  * 
  * @author Dave Johnson
  */

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=413725&r1=413724&r2=413725&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 11:49:26 2006
@@ -55,10 +55,10 @@
 /**
  * Action for quering, approving, marking as spam and deleting comments.
  *
- * @struts.action path="/editor/commentManagement" name="commentManagementForm" 
+ * @struts.action path="/roller-ui/authoring/commentManagement" name="commentManagementForm" 
  *     scope="request" parameter="method"
  *
- * @struts.action path="/editor/commentQuery" name="commentQueryForm" 
+ * @struts.action path="/roller-ui/authoring/commentQuery" name="commentQueryForm" 
  *     scope="request" parameter="method"
  *
  * @struts.action path="/admin/commentManagement" name="commentManagementForm" 
@@ -371,7 +371,7 @@
             StringBuffer sb = new StringBuffer();
             sb.append(request.getContextPath());
             if (getWebsite() != null) {
-                sb.append("/editor/commentManagement.do"); // TODO: get path from Struts
+                sb.append("/roller-ui/authoring/commentManagement.do"); // TODO: get path from Struts
                 sb.append("?method=query");
                 sb.append("&weblog=");
                 sb.append(getWebsite().getHandle());

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java Mon Jun 12 11:49:26 2006
@@ -50,7 +50,7 @@
 /**
  * Allows user to create a new website.
  * 
- * @struts.action path="/editor/createWebsite" parameter="method" name="createWebsiteForm"
+ * @struts.action path="/roller-ui/authoring/createWebsite" parameter="method" name="createWebsiteForm"
  * @struts.action-forward name="createWebsite.page" path=".CreateWebsite"
  * @struts.action-forward name="createWebsiteDone.page" path=".CreateWebsiteDone"
  */

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java Mon Jun 12 11:49:26 2006
@@ -44,7 +44,7 @@
  * Administer custom ping targets.
  *
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @struts.action name="pingTargetForm" path="/editor/customPingTargets" scope="request" parameter="method"
+ * @struts.action name="pingTargetForm" path="/roller-ui/authoring/customPingTargets" scope="request" parameter="method"
  * @struts.action-forward name="pingTargets.page" path=".CustomPingTargets"
  * @struts.action-forward name="pingTargetEdit.page" path=".CustomPingTargetEdit"
  * @struts.action-forward name="pingTargetDeleteOK.page" path=".CustomPingTargetDeleteOK"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java Mon Jun 12 11:49:26 2006
@@ -59,7 +59,7 @@
 import org.apache.roller.util.DateUtil;
 
 /**
- * @struts.action path="/editor/exportEntries" name="weblogQueryForm" 
+ * @struts.action path="/roller-ui/authoring/exportEntries" name="weblogQueryForm" 
  *    scope="request" parameter="method"
  * 
  * @struts.action-forward name="exportEntries.page" path=".export-entries"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java Mon Jun 12 11:49:26 2006
@@ -35,7 +35,7 @@
 import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx;
 
 /**
- * @struts.action path="/editor/folderEdit" name="folderFormEx" validate="false"
+ * @struts.action path="/roller-ui/authoring/folderEdit" name="folderFormEx" validate="false"
  * @struts.action-forward name="FolderForm" path=".FolderForm"
  * 
  * @author Dave Johnson

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java Mon Jun 12 11:49:26 2006
@@ -40,9 +40,9 @@
 import org.apache.roller.util.cache.CacheManager;
 
 /**
- * @struts.action path="/editor/folderSave" name="folderFormEx" 
- *     validate="true" input="/editor/folderEdit.do"
- * @struts.action-forward name="Bookmarks" path="/editor/bookmarks.do?method=selectFolder"
+ * @struts.action path="/roller-ui/authoring/folderSave" name="folderFormEx" 
+ *     validate="true" input="/roller-ui/authoring/folderEdit.do"
+ * @struts.action-forward name="Bookmarks" path="/roller-ui/authoring/bookmarks.do?method=selectFolder"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java Mon Jun 12 11:49:26 2006
@@ -51,7 +51,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 /**
- * @struts.action name="folderFormEx" path="/editor/importBookmarks"
+ * @struts.action name="folderFormEx" path="/roller-ui/authoring/importBookmarks"
  *  scope="request" input=".import" validate="false"
  *
  * @struts.action-forward name="importBookmarks.page" path=".import"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Mon Jun 12 11:49:26 2006
@@ -45,7 +45,7 @@
 import org.apache.roller.util.StringUtils;
 /**
  * TODO: revisit this class once Atom 1.0 support comes to Rome
- * @struts.action name="importEntries" path="/editor/importEntries"
+ * @struts.action name="importEntries" path="/roller-ui/authoring/importEntries"
  *                scope="request" parameter="method"
  * 
  * @struts.action-forward name="importEntries.page" path=".import-entries"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java Mon Jun 12 11:49:26 2006
@@ -59,7 +59,7 @@
 /**
  * Allows website admin to invite new members to website.
  * 
- * @struts.action path="/editor/inviteMember" parameter="method" name="inviteMemberForm"
+ * @struts.action path="/roller-ui/authoring/inviteMember" parameter="method" name="inviteMemberForm"
  * @struts.action-forward name="inviteMember.page" path=".InviteMember"
  */
 public class InviteMemberAction extends DispatchAction
@@ -238,7 +238,7 @@
                     rootURL = RequestUtils.serverURL(request) 
                                   + request.getContextPath();
                 }               
-                String url = rootURL + "/editor/yourWebsites.do";
+                String url = rootURL + "/roller-ui/authoring/yourWebsites.do";
                 
                 ResourceBundle resources = ResourceBundle.getBundle(
                     "ApplicationResources", 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java Mon Jun 12 11:49:26 2006
@@ -50,7 +50,7 @@
  * Allows user to perform Website maintenence operations such as flushing
  * the website page cache or re-indexing the website search index.
  * 
- * @struts.action path="/editor/maintenance" name="maintenanceForm" 
+ * @struts.action path="/roller-ui/authoring/maintenance" name="maintenanceForm" 
  *     scope="request" parameter="method"
  * 
  * @struts.action-forward name="maintenance.page" path=".Maintenance"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java Mon Jun 12 11:49:26 2006
@@ -49,7 +49,7 @@
 /**
  * Allows website admin to change website member permissions.
  * 
- * @struts.action path="/editor/memberPermissions" parameter="method" name="memberPermissionsForm"
+ * @struts.action path="/roller-ui/authoring/memberPermissions" parameter="method" name="memberPermissionsForm"
  * @struts.action-forward name="memberPermissions.page" path=".MemberPermissions"
  */
 public class MemberPermissionsAction extends DispatchAction

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java Mon Jun 12 11:49:26 2006
@@ -59,7 +59,7 @@
  * Actions for setting up automatic ping configuration for a weblog.
  *
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
- * @struts.action name="pingSetupForm" path="/editor/pingSetup" scope="request" parameter="method"
+ * @struts.action name="pingSetupForm" path="/roller-ui/authoring/pingSetup" scope="request" parameter="method"
  * @struts.action-forward name="pingSetup.page" path=".Pings"
  * @struts.action-forward name="pingResult.page" path=".PingResult"
  */

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java Mon Jun 12 11:49:26 2006
@@ -45,7 +45,7 @@
 
 /**
  * Display today's referers.
- * @struts.action name="refererForm" path="/editor/referers"
+ * @struts.action name="refererForm" path="/roller-ui/authoring/referers"
  *      scope="session" parameter="method"
  * 
  * @struts.action-forward name="referers.page" path=".referers"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java Mon Jun 12 11:49:26 2006
@@ -52,7 +52,7 @@
  *
  * @author Allen Gilliland
  *
- * @struts.action name="themeEditorForm" path="/editor/themeEditor"
+ * @struts.action name="themeEditorForm" path="/roller-ui/authoring/themeEditor"
  *    scope="session" parameter="method"
  *
  * @struts.action-forward name="editTheme.page" path=".theme-editor"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java Mon Jun 12 11:49:26 2006
@@ -38,7 +38,7 @@
 
 /**
  * Toggle display of a linkback.
- * @struts.action path="/editor/toggleLinkback" name="toggleLinkback"
+ * @struts.action path="/roller-ui/authoring/toggleLinkback" name="toggleLinkback"
  */
 public class ToggleLinkbackDisplayAction extends Action
 {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Mon Jun 12 11:49:26 2006
@@ -58,7 +58,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 /**
- * @struts.action name="uploadFiles" path="/editor/uploadFiles"
+ * @struts.action name="uploadFiles" path="/roller-ui/authoring/uploadFiles"
  *  	parameter="method" scope="request" validate="false"
  *
  * @struts.action-forward name="uploadFiles.page" path=".upload-file"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java Mon Jun 12 11:49:26 2006
@@ -88,7 +88,7 @@
 /**
  * Supports Weblog Entry form actions edit, remove, update, etc.
  *
- * @struts.action name="weblogEntryFormEx" path="/editor/weblog"
+ * @struts.action name="weblogEntryFormEx" path="/roller-ui/authoring/weblog"
  *     scope="request" parameter="method"
  *
  * @struts.action-forward name="weblogEdit.page" path=".WeblogEdit"
@@ -431,7 +431,7 @@
                     + request.getContextPath();
                 }
                 String editURL = rootURL
-                        + "/editor/weblog.do?method=edit&entryid=" + entry.getId();
+                        + "/roller-ui/authoring/weblog.do?method=edit&entryid=" + entry.getId();
                 
                 ResourceBundle resources = ResourceBundle.getBundle(
                         "ApplicationResources", request.getLocale());

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java Mon Jun 12 11:49:26 2006
@@ -49,7 +49,7 @@
 /**
  * Query weblog entries and display the results in tabular form.
  *
- * @struts.action path="/editor/weblogEntryManagement" name="weblogEntryManagementForm" 
+ * @struts.action path="/roller-ui/authoring/weblogEntryManagement" name="weblogEntryManagementForm" 
  *     scope="request" parameter="method"
  * 
  * @struts.action-forward name="weblogEntryManagement.page" path=".WeblogEntryManagement"
@@ -229,7 +229,7 @@
         private String getQueryLink() {
             StringBuffer sb = new StringBuffer();
             sb.append(request.getContextPath());
-            sb.append("/editor/weblogEntryManagement.do"); // TODO: get path from Struts
+            sb.append("/roller-ui/authoring/weblogEntryManagement.do"); // TODO: get path from Struts
             sb.append("?method=query");
             sb.append("&weblog=");
             sb.append(getWebsite().getHandle());

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java Mon Jun 12 11:49:26 2006
@@ -55,7 +55,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /**
  * Page form action.
- * @struts.action name="weblogTemplateForm" path="/editor/page"
+ * @struts.action name="weblogTemplateForm" path="/roller-ui/authoring/page"
  *  	scope="session" parameter="method"
  * 
  * @struts.action-forward name="removePage.page" path=".remove-page"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java Mon Jun 12 11:49:26 2006
@@ -67,7 +67,7 @@
 /**
  * Website Settings action.
  *
- * @struts.action name="websiteFormEx" path="/editor/website"
+ * @struts.action name="websiteFormEx" path="/roller-ui/authoring/website"
  * 		scope="session" parameter="method"
  *
  * @struts.action-forward name="editWebsite.page" path=".edit-website"

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java Mon Jun 12 11:49:26 2006
@@ -43,7 +43,7 @@
 /**
  * Allows user to edit his/her profile.
  * 
- * @struts.action name="userFormEx" path="/editor/yourProfile" parameter="method"
+ * @struts.action name="userFormEx" path="/roller-ui/authoring/yourProfile" parameter="method"
  * @struts.action-forward name="yourProfile.page" path=".YourProfile"
  */
 public class YourProfileAction extends UserBaseAction

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java Mon Jun 12 11:49:26 2006
@@ -47,7 +47,7 @@
 /**
  * Allows user to view and pick from list of his/her websites.
  * 
- * @struts.action path="/editor/yourWebsites" name="yourWebsitesForm" parameter="method"
+ * @struts.action path="/roller-ui/authoring/yourWebsites" name="yourWebsitesForm" parameter="method"
  * @struts.action-forward name="yourWebsites.page" path=".YourWebsites"
  */
 public class YourWebsitesAction extends DispatchAction

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Mon Jun 12 11:49:26 2006
@@ -474,7 +474,7 @@
             ownermsg.append((escapeHtml) ? "\n" : "<br />");
             
             StringBuffer deleteURL = new StringBuffer(rootURL);
-            deleteURL.append("/editor/commentManagement.do?method=query&entryid=" + entry.getId());
+            deleteURL.append("/roller-ui/authoring/commentManagement.do?method=query&entryid=" + entry.getId());
             
             if (escapeHtml) {
                 ownermsg.append(deleteURL.toString());

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties Mon Jun 12 11:49:26 2006
@@ -140,7 +140,7 @@
 schemeenforcement.enabled=false
 # URL patterns that require HTTPS
 schemeenforcement.https.urls=/j_security_check,/login-redirect.jsp,/login.jsp,\
-/user.do,/editor/yourProfile.do,/admin/user.do,/editor/userdata
+/user.do,/roller-ui/authoring/yourProfile.do,/admin/user.do,/roller-ui/authoring/userdata
 
 # Password security settings
 passwds.encryption.enabled=false

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=413725&r1=413724&r2=413725&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 11:49:26 2006
@@ -182,7 +182,7 @@
                            </a>
                        </td>
                        <td width="%15">
-                           <c:url value="/editor/weblog.do" var="newEntry">
+                           <c:url value="/roller-ui/authoring/weblog.do" var="newEntry">
                                <c:param name="method" value="create" />
                                <c:param name="weblog" value="${perms.website.handle}" />
                            </c:url>
@@ -191,7 +191,7 @@
                                <fmt:message key="userAdmin.newEntry" /></a>
                        </td>
                        <td width="%15">
-                           <c:url value="/editor/weblogEntryManagement.do" var="editEntries">
+                           <c:url value="/roller-ui/authoring/weblogEntryManagement.do" var="editEntries">
                                <c:param name="method" value="query" />
                                <c:param name="weblog" value="${perms.website.handle}" />
                            </c:url>
@@ -200,7 +200,7 @@
                                <fmt:message key="userAdmin.editEntries" /></a> 
                        </td>
                        <td width="%15">
-                           <c:url value="/editor/website.do" var="manageWeblog">
+                           <c:url value="/roller-ui/authoring/website.do" var="manageWeblog">
                                <c:param name="method" value="edit" />
                                <c:param name="weblog" value="${perms.website.handle}" />
                            </c:url>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarkForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarkForm.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarkForm.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarkForm.jsp Mon Jun 12 11:49:26 2006
@@ -15,90 +15,90 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
-<%@ include file="/taglibs.jsp" %>
-
-<c:if test="${!empty parentFolder.parent.path}">
-    <c:set var="folderName" value="${parentFolder.parent.path}" />
-</c:if>
-<c:if test="${empty parentFolder.parent.path}">
-    <c:set var="folderName" value="/" />
-</c:if>
-
-<p class="subtitle">
-<c:if test="${state == 'add'}">
-    <fmt:message key="bookmarkForm.add.subtitle" >
-        <fmt:param value="${folderName}" />
-    </fmt:message>
-</c:if>
-<c:if test="${state == 'edit'}">
-    <fmt:message key="bookmarkForm.edit.subtitle" >
-        <fmt:param value="${folderName}" />
-    </fmt:message>
-</c:if>
-<c:if test="${state == 'correct'}">
-    <fmt:message key="bookmarkForm..correct.subtitle" >
-        <fmt:param value="${folderName}" />
-    </fmt:message>
-</c:if>
-</p>
-
-<p>
-<b><fmt:message key="bookmarksForm.path" /></b>:
-   <c:out value="${folderName}" />
-</p>
-
-<html:form action="/editor/bookmarkSave" method="post" focus="name">
-
-    <html:hidden property="method" value="update"/></input>
-    <html:hidden property="id" /></input>
-
-    <input type="hidden" name="<%= RollerRequest.FOLDERID_KEY %>" 
-        value="<%= request.getAttribute(RollerRequest.FOLDERID_KEY) %>" />
-						   
-    <table>
-    							 
-	<tr>
-	    <td><fmt:message key="bookmarkForm.name" /></td>
-	    <td><html:text property="name" maxlength="255" size="70" /></input></td>
-    </tr>
-
-	<tr>
-	    <td><fmt:message key="bookmarkForm.description" /></td>
-	    <td><html:textarea property="description" rows="5" cols="50" /></td>
-    </tr>
-
-	<tr>
-	    <td><fmt:message key="bookmarkForm.url" /></td>                
-	    <td><html:text property="url" maxlength="255" size="70" /></input></td>
-    </tr>
-						  
-	<tr>
-	    <td><fmt:message key="bookmarkForm.rssUrl" /></td>         
-	    <td><html:text property="feedUrl" maxlength="255" size="70" /></input></td>
-    </tr>
-							
-	<tr>
-	    <td><fmt:message key="bookmarkForm.image" /></td>          
-	    <td><html:text property="image" maxlength="255" size="70" /></input></td>
-    </tr>
-
-	<tr>
-	    <td><fmt:message key="bookmarkForm.priority" /></td>         
-	    <td><html:text property="priority" maxlength="255" size="5" /></input></td>
-    </tr>
-
-	<tr>
-        <td><fmt:message key="bookmarkForm.weight" /></td>          
-	    <td><html:text property="weight" maxlength="255" size="5" /></input></td>
-    </tr>
-							
-    </table>
-
-    <p>
-    <input type="submit" value="<fmt:message key='bookmarkForm.save'/>" />
-    <input type="button" value="<fmt:message key='bookmarkForm.cancel' />" 
-        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderId=<%=
-        request.getAttribute(RollerRequest.FOLDERID_KEY) %>'" />
-    </p>
-
-</html:form>
+<%@ include file="/taglibs.jsp" %>
+
+<c:if test="${!empty parentFolder.parent.path}">
+    <c:set var="folderName" value="${parentFolder.parent.path}" />
+</c:if>
+<c:if test="${empty parentFolder.parent.path}">
+    <c:set var="folderName" value="/" />
+</c:if>
+
+<p class="subtitle">
+<c:if test="${state == 'add'}">
+    <fmt:message key="bookmarkForm.add.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
+</c:if>
+<c:if test="${state == 'edit'}">
+    <fmt:message key="bookmarkForm.edit.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
+</c:if>
+<c:if test="${state == 'correct'}">
+    <fmt:message key="bookmarkForm..correct.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
+</c:if>
+</p>
+
+<p>
+<b><fmt:message key="bookmarksForm.path" /></b>:
+   <c:out value="${folderName}" />
+</p>
+
+<html:form action="/roller-ui/authoring/bookmarkSave" method="post" focus="name">
+
+    <html:hidden property="method" value="update"/></input>
+    <html:hidden property="id" /></input>
+
+    <input type="hidden" name="<%= RollerRequest.FOLDERID_KEY %>" 
+        value="<%= request.getAttribute(RollerRequest.FOLDERID_KEY) %>" />
+						   
+    <table>
+    							 
+	<tr>
+	    <td><fmt:message key="bookmarkForm.name" /></td>
+	    <td><html:text property="name" maxlength="255" size="70" /></input></td>
+    </tr>
+
+	<tr>
+	    <td><fmt:message key="bookmarkForm.description" /></td>
+	    <td><html:textarea property="description" rows="5" cols="50" /></td>
+    </tr>
+
+	<tr>
+	    <td><fmt:message key="bookmarkForm.url" /></td>                
+	    <td><html:text property="url" maxlength="255" size="70" /></input></td>
+    </tr>
+						  
+	<tr>
+	    <td><fmt:message key="bookmarkForm.rssUrl" /></td>         
+	    <td><html:text property="feedUrl" maxlength="255" size="70" /></input></td>
+    </tr>
+							
+	<tr>
+	    <td><fmt:message key="bookmarkForm.image" /></td>          
+	    <td><html:text property="image" maxlength="255" size="70" /></input></td>
+    </tr>
+
+	<tr>
+	    <td><fmt:message key="bookmarkForm.priority" /></td>         
+	    <td><html:text property="priority" maxlength="255" size="5" /></input></td>
+    </tr>
+
+	<tr>
+        <td><fmt:message key="bookmarkForm.weight" /></td>          
+	    <td><html:text property="weight" maxlength="255" size="5" /></input></td>
+    </tr>
+							
+    </table>
+
+    <p>
+    <input type="submit" value="<fmt:message key='bookmarkForm.save'/>" />
+    <input type="button" value="<fmt:message key='bookmarkForm.cancel' />" 
+        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderId=<%=
+        request.getAttribute(RollerRequest.FOLDERID_KEY) %>'" />
+    </p>
+
+</html:form>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksForm.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksForm.jsp Mon Jun 12 11:49:26 2006
@@ -15,195 +15,195 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
-<%@ include file="/taglibs.jsp" %>
-<% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
-
-<%-- JavaScript for bookmarks table --%> 
-<script type="text/javascript">
-<!-- 
-function setChecked(val) 
-{
-    len = document.bookmarksForm.elements.length;
-    var i=0;
-    for( i=0 ; i<len ; i++) 
-    {
-        document.bookmarksForm.elements[i].checked=val;
-    }
-}
-function onDelete() 
-{
-    if ( confirm("Delete selected bookmarks?") ) 
-    {
-        document.bookmarksForm.method.value = "deleteSelected";
-        document.bookmarksForm.submit();
-    }
- }
-function onMove() 
-{
-    if ( confirm("Move selected bookmarks?") ) 
-    {
-        document.bookmarksForm.method.value = "moveSelected";
-        document.bookmarksForm.submit();
-    }
-}
-//-->
-</script>
-
-<c:choose>
-    <c:when test="${empty model.folderPath}">
-       <p class="subtitle">
-           <fmt:message key="bookmarksForm.subtitle" >
-               <fmt:param value="${model.website.handle}" />
-           </fmt:message>
-       </p>  
-       <p class="pagetip">
-           <fmt:message key="bookmarksForm.rootPrompt" />
-       </p>
-    </c:when>
-    
-    <c:otherwise>
-        <p class="subtitle">
-        <fmt:message key="bookmarksForm.path" />:
-        <c:forEach var="loopfolder" items="${model.folderPath}">
-            /
-            <roller:link page="/editor/bookmarks.do">
-                <roller:linkparam id="method" value="selectFolder" />
-                <roller:linkparam 
-                    id="<%= RollerRequest.FOLDERID_KEY %>" 
-                    name="loopfolder" property="id" />
-                <c:out value="${loopfolder.name}" />
-            </roller:link>
-        </c:forEach>
-        <p>
-        <p><fmt:message key="bookmarksForm.folderPrompt" /></p>
-    </c:otherwise>
-</c:choose>
-
-<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
-
-<html:form action="/editor/bookmarks" method="post">
-<input type="hidden" name="method" /> 
-<html:hidden property="folderId" /> 
-
-<%-- Select-all button --%>
-<input type="button" value="<fmt:message key='bookmarksForm.checkAll' />" 
-   onclick="setChecked(1)" /></input>
-
-<%-- Select-none button --%>
-<input type="button" value="<fmt:message key='bookmarksForm.checkNone' />" 
-   onclick="setChecked(0)" /></input>
-
-<%-- Delete-selected button --%>
-<input type="button" value="<fmt:message key='bookmarksForm.delete' />" 
-   onclick="onDelete()"/></input>
-
-<c:if test="${!empty model.allFolders}">
-    <%-- Move-selected button --%>
-    <input type="button" value="<fmt:message key='bookmarksForm.move' />"   
-       onclick="onMove()"/></input>
-
-    <%-- Move-to combo-box --%>
-    <html:select property="moveToFolderId" size="1">
-        <html:options collection="allFolders" 
-            property="id" labelProperty="path"/>
-    </html:select>
-</c:if>
-<p />
-
-<table class="rollertable">
-
-    <tr class="rHeaderTr">
-        <th class="rollertable" width="5%">&nbsp;</th>
-        <th class="rollertable" width="5%">&nbsp;</th>
-        <th class="rollertable" width="30%"><fmt:message key="bookmarksForm.name" /></th>
-        <th class="rollertable" width="50%"><fmt:message key="bookmarksForm.description" /></th>
-        <th class="rollertable" width="5%"><fmt:message key="bookmarksForm.edit" /></th>
-        <th class="rollertable" width="5%"><fmt:message key="bookmarksForm.visitLink" /></th>
-    </tr>
-
-    <%-- Folders --%>
-    <c:forEach var="loopfolder" items="${model.folder.folders}" >
-        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
-
-            <td class="rollertable">
-                <html:multibox property="selectedFolders">
-                    <c:out value="${loopfolder.id}" />
-                </html:multibox>
-            </td>
-
-
-            <td class="rollertable" align="center"><img src='<c:url value="/images/folder.png"/>' alt="icon" /></td>
-            
-            <td class="rollertable">
-               <roller:link page="/editor/bookmarks.do">
-                   <roller:linkparam id="method" value="selectFolder" />
-                   <roller:linkparam 
-                       id="<%= RollerRequest.FOLDERID_KEY %>" 
-                       name="loopfolder" property="id" />
-                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopfolder.name}" /></str:truncateNicely>
-               </roller:link>
-            </td>
-
-            <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopfolder.description}" /></str:truncateNicely>
-            </td>
-
-            <td class="rollertable" align="center">
-               <roller:link page="/editor/folderEdit.do">
-                   <roller:linkparam 
-                       id="<%= RollerRequest.FOLDERID_KEY %>" 
-                       name="loopfolder" property="id" />
-                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" />
-               </roller:link>
-            </td>
-
-            <td class="rollertable">&nbsp;</td>
-
-        </roller:row>
-    </c:forEach>
-
-    <%-- Bookmarks --%>
-    <c:forEach var="loopbookmark" items="${model.folder.bookmarks}" >
-        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
-
-            <td class="rollertable">
-                <html:multibox property="selectedBookmarks">
-                    <c:out value="${loopbookmark.id}" />
-                </html:multibox>
-            </td>
-
-            <td class="rollertable" align="center"><img src='<c:url value="/images/link.png"/>' alt="icon" /></td>
-            
-            <td class="rollertable">
-                <str:truncateNicely lower="15" upper="20" ><c:out value="${loopbookmark.name}" /></str:truncateNicely>
-            </td>
-
-            <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopbookmark.description}" /></str:truncateNicely>
-            </td>
-
-            <td class="rollertable" align="center">
-               <roller:link page="/editor/bookmarkEdit.do">
-                   <roller:linkparam 
-                       id="<%= RollerRequest.BOOKMARKID_KEY %>" 
-                       name="loopbookmark" property="id" />                   
-                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" 
-                       title="<fmt:message key='bookmarksForm.edit.tip' />" />
-               </roller:link>
-            </td>
-
-            <td class="rollertable" align="center">
-                <c:if test="${!empty loopbookmark.url}" >
-                   <a href="<c:out value='${loopbookmark.url}'/>">
-                       <img src='<c:url value="/images/world_go.png"/>' border="0" alt="icon" 
-                           title="<fmt:message key='bookmarksForm.visitLink.tip' />" />
-                   </a>
-                </c:if>
-            </td>
-
-        </roller:row>
-    </c:forEach>
-
-</table>
-
-</html:form>
+<%@ include file="/taglibs.jsp" %>
+<% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
+
+<%-- JavaScript for bookmarks table --%> 
+<script type="text/javascript">
+<!-- 
+function setChecked(val) 
+{
+    len = document.bookmarksForm.elements.length;
+    var i=0;
+    for( i=0 ; i<len ; i++) 
+    {
+        document.bookmarksForm.elements[i].checked=val;
+    }
+}
+function onDelete() 
+{
+    if ( confirm("Delete selected bookmarks?") ) 
+    {
+        document.bookmarksForm.method.value = "deleteSelected";
+        document.bookmarksForm.submit();
+    }
+ }
+function onMove() 
+{
+    if ( confirm("Move selected bookmarks?") ) 
+    {
+        document.bookmarksForm.method.value = "moveSelected";
+        document.bookmarksForm.submit();
+    }
+}
+//-->
+</script>
+
+<c:choose>
+    <c:when test="${empty model.folderPath}">
+       <p class="subtitle">
+           <fmt:message key="bookmarksForm.subtitle" >
+               <fmt:param value="${model.website.handle}" />
+           </fmt:message>
+       </p>  
+       <p class="pagetip">
+           <fmt:message key="bookmarksForm.rootPrompt" />
+       </p>
+    </c:when>
+    
+    <c:otherwise>
+        <p class="subtitle">
+        <fmt:message key="bookmarksForm.path" />:
+        <c:forEach var="loopfolder" items="${model.folderPath}">
+            /
+            <roller:link page="/roller-ui/authoring/bookmarks.do">
+                <roller:linkparam id="method" value="selectFolder" />
+                <roller:linkparam 
+                    id="<%= RollerRequest.FOLDERID_KEY %>" 
+                    name="loopfolder" property="id" />
+                <c:out value="${loopfolder.name}" />
+            </roller:link>
+        </c:forEach>
+        <p>
+        <p><fmt:message key="bookmarksForm.folderPrompt" /></p>
+    </c:otherwise>
+</c:choose>
+
+<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
+
+<html:form action="/roller-ui/authoring/bookmarks" method="post">
+<input type="hidden" name="method" /> 
+<html:hidden property="folderId" /> 
+
+<%-- Select-all button --%>
+<input type="button" value="<fmt:message key='bookmarksForm.checkAll' />" 
+   onclick="setChecked(1)" /></input>
+
+<%-- Select-none button --%>
+<input type="button" value="<fmt:message key='bookmarksForm.checkNone' />" 
+   onclick="setChecked(0)" /></input>
+
+<%-- Delete-selected button --%>
+<input type="button" value="<fmt:message key='bookmarksForm.delete' />" 
+   onclick="onDelete()"/></input>
+
+<c:if test="${!empty model.allFolders}">
+    <%-- Move-selected button --%>
+    <input type="button" value="<fmt:message key='bookmarksForm.move' />"   
+       onclick="onMove()"/></input>
+
+    <%-- Move-to combo-box --%>
+    <html:select property="moveToFolderId" size="1">
+        <html:options collection="allFolders" 
+            property="id" labelProperty="path"/>
+    </html:select>
+</c:if>
+<p />
+
+<table class="rollertable">
+
+    <tr class="rHeaderTr">
+        <th class="rollertable" width="5%">&nbsp;</th>
+        <th class="rollertable" width="5%">&nbsp;</th>
+        <th class="rollertable" width="30%"><fmt:message key="bookmarksForm.name" /></th>
+        <th class="rollertable" width="50%"><fmt:message key="bookmarksForm.description" /></th>
+        <th class="rollertable" width="5%"><fmt:message key="bookmarksForm.edit" /></th>
+        <th class="rollertable" width="5%"><fmt:message key="bookmarksForm.visitLink" /></th>
+    </tr>
+
+    <%-- Folders --%>
+    <c:forEach var="loopfolder" items="${model.folder.folders}" >
+        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+
+            <td class="rollertable">
+                <html:multibox property="selectedFolders">
+                    <c:out value="${loopfolder.id}" />
+                </html:multibox>
+            </td>
+
+
+            <td class="rollertable" align="center"><img src='<c:url value="/images/folder.png"/>' alt="icon" /></td>
+            
+            <td class="rollertable">
+               <roller:link page="/roller-ui/authoring/bookmarks.do">
+                   <roller:linkparam id="method" value="selectFolder" />
+                   <roller:linkparam 
+                       id="<%= RollerRequest.FOLDERID_KEY %>" 
+                       name="loopfolder" property="id" />
+                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopfolder.name}" /></str:truncateNicely>
+               </roller:link>
+            </td>
+
+            <td class="rollertable">
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopfolder.description}" /></str:truncateNicely>
+            </td>
+
+            <td class="rollertable" align="center">
+               <roller:link forward="folderEdit">
+                   <roller:linkparam 
+                       id="<%= RollerRequest.FOLDERID_KEY %>" 
+                       name="loopfolder" property="id" />
+                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" />
+               </roller:link>
+            </td>
+
+            <td class="rollertable">&nbsp;</td>
+
+        </roller:row>
+    </c:forEach>
+
+    <%-- Bookmarks --%>
+    <c:forEach var="loopbookmark" items="${model.folder.bookmarks}" >
+        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+
+            <td class="rollertable">
+                <html:multibox property="selectedBookmarks">
+                    <c:out value="${loopbookmark.id}" />
+                </html:multibox>
+            </td>
+
+            <td class="rollertable" align="center"><img src='<c:url value="/images/link.png"/>' alt="icon" /></td>
+            
+            <td class="rollertable">
+                <str:truncateNicely lower="15" upper="20" ><c:out value="${loopbookmark.name}" /></str:truncateNicely>
+            </td>
+
+            <td class="rollertable">
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopbookmark.description}" /></str:truncateNicely>
+            </td>
+
+            <td class="rollertable" align="center">
+               <roller:link page="/roller-ui/authoring/bookmarkEdit.do">
+                   <roller:linkparam 
+                       id="<%= RollerRequest.BOOKMARKID_KEY %>" 
+                       name="loopbookmark" property="id" />                   
+                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" 
+                       title="<fmt:message key='bookmarksForm.edit.tip' />" />
+               </roller:link>
+            </td>
+
+            <td class="rollertable" align="center">
+                <c:if test="${!empty loopbookmark.url}" >
+                   <a href="<c:out value='${loopbookmark.url}'/>">
+                       <img src='<c:url value="/images/world_go.png"/>' border="0" alt="icon" 
+                           title="<fmt:message key='bookmarksForm.visitLink.tip' />" />
+                   </a>
+                </c:if>
+            </td>
+
+        </roller:row>
+    </c:forEach>
+
+</table>
+
+</html:form>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -29,7 +29,7 @@
             <p>
             <%-- Add Bookmark link --%>
             <img src='<c:url value="/images/link_add.png"/>' border="0"alt="icon" />
-            <roller:link page="/editor/bookmarkEdit.do">
+            <roller:link page="/roller-ui/authoring/bookmarkEdit.do">
                 <roller:linkparam id="<%= RollerRequest.FOLDERID_KEY %>"
                     name="folder" property="id" />
                 <fmt:message key="bookmarksForm.addBookmark" />
@@ -39,7 +39,7 @@
 			<%-- Add Folder link --%>
 			<p>
             <img src='<c:url value="/images/folder_add.png"/>' border="0"alt="icon" />
-			<roller:link page="/editor/folderEdit.do">
+			<roller:link page="/roller-ui/authoring/folderEdit.do">
 			    <roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
 			         name="folder" property="id" />
 			    <fmt:message key="bookmarksForm.addFolder" />
@@ -50,7 +50,7 @@
                 <%-- Import bookmarks --%>
                 <p>
                 <img src='<c:url value="/images/link_add.png"/>' border="0"alt="icon" />
-                <roller:link page="/editor/importBookmarks.do">
+                <roller:link page="/roller-ui/authoring/importBookmarks.do">
                     <roller:linkparam id="<%= RollerRequest.FOLDERID_KEY %>"
                         name="folder" property="id" />
                     <fmt:message key="bookmarksForm.importBookmarks" />

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesForm.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesForm.jsp Mon Jun 12 11:49:26 2006
@@ -15,157 +15,157 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
-<%@ include file="/taglibs.jsp" %>
-
-<%-- JavaScript for categories table --%> 
-<script type="text/javascript">
-<!-- 
-function setChecked(val) 
-{
-    len = document.categoriesForm.elements.length;
-    var i=0;
-    for( i=0 ; i<len ; i++) 
-    {
-        document.categoriesForm.elements[i].checked=val;
-    }
-}
-function onMove() 
-{
-    if ( confirm("Move selected categories?") ) 
-    {
-        document.categoriesForm.method.value = "moveSelected";
-        document.categoriesForm.submit();
-    }
-}
-//-->
-</script>
-
-<c:choose>
-    <c:when test="${empty model.categoryPath}">
-    <p class="subtitle">
-        <fmt:message key="categoriesForm.subtitle" >
-            <fmt:param value="${model.website.handle}" />
-        </fmt:message>
-    </p>  
-    <p class="pagetip">
-        <fmt:message key="categoriesForm.rootPrompt" />
-    </p> 
-    </c:when>
-    
-    <c:otherwise>
-        <p>
-        <b><fmt:message key="categoriesForm.path" /></b>:
-        <c:forEach var="loopcategory" items="${model.categoryPath}">
-            /
-            <roller:link page="/editor/categories.do">
-                <roller:linkparam id="method" value="selectCategory" />
-                <roller:linkparam 
-                    id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                    name="loopcategory" property="id" />
-                <c:out value="${loopcategory.name}" />
-            </roller:link>
-        </c:forEach>
-        </p>
-        <p><fmt:message key="categoriesForm.categoryPrompt" /></p>
-    </c:otherwise>
-</c:choose>
-
-
-<%-- Form is a table of categories each with checkbox --%>
-
-<html:form action="/editor/categories" method="post">
-<input type="hidden" name="method" /> 
-<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' /> 
-<html:hidden property="parentId" /> 
-
-<%-- Select-all button --%>
-<input type="button" value="<fmt:message key='categoriesForm.checkAll' />" 
-   onclick="setChecked(1)" /></input>
-
-<%-- Select-none button --%>
-<input type="button" value="<fmt:message key='categoriesForm.checkNone' />" 
-   onclick="setChecked(0)" /></input>
-
-</td>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-<%-- Move-selected button --%>
-<input type="button" value="<fmt:message key='categoriesForm.move' />"   
-   onclick="onMove()"/></input>
-
-<%-- Move-to combo-box --%>
-<html:select property="moveToCategoryId" size="1">
-    <html:options collection="allCategories" 
-        property="id" labelProperty="path"/>
-</html:select>
-
-<p />
-
-<br />
-
-<table class="rollertable">
-
-    <tr class="rollertable">
-        <th class="rollertable" width="5%">&nbsp;</td>
-        <th class="rollertable" width="5%">&nbsp;</td>
-        <th class="rollertable" width="30%"><fmt:message key="categoriesForm.name" /></td>
-        <th class="rollertable" width="45%"><fmt:message key="categoriesForm.description" /></td>
-        <th class="rollertable" width="5%"><fmt:message key="categoriesForm.edit" /></td>
-        <th class="rollertable" width="5%"><fmt:message key="categoriesForm.remove" /></td>
-    </tr>
-
-    <%-- Categories --%>
-    <c:forEach var="loopcategory" items="${model.category.weblogCategories}" >
-        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
-
-            <td class="rollertable">
-                <html:multibox property="selectedCategories">
-                    <c:out value="${loopcategory.id}" />
-                </html:multibox>
-            </td>
-
-
-            <td class="rollertable" align="center"><img src='<c:url value="/images/folder.png"/>' alt="icon" /></td>
-            
-            <td class="rollertable">
-               <roller:link page="/editor/categories.do">
-                   <roller:linkparam id="method" value="selectCategory" />
-                   <roller:linkparam 
-                       id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                       name="loopcategory" property="id" />
-                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopcategory.name}" /></str:truncateNicely>
-               </roller:link>
-            </td>
-
-            <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopcategory.description}" /></str:truncateNicely>
-            </td>
-
-            <td class="rollertable" align="center">
-               <roller:link page="/editor/categoryEdit.do">
-                   <roller:linkparam 
-                       id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                       name="loopcategory" property="id" />
-                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" />
-               </roller:link>
-            </td>
-
-            <td class="rollertable" align="center">
-               <roller:link page="/editor/categoryDelete.do">
-                   <roller:linkparam 
-	                   id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-	                   name="loopcategory" property="id" />
-                   <roller:linkparam 
-	                   id="method" value="deleteSelected" />
-                   <img src='<c:url value="/images/delete.png"/>' border="0" alt="icon" />
-               </roller:link>
-            </td>
-
-        </roller:row>
-    </c:forEach>
-
-</table>
-
-</html:form>
-
+<%@ include file="/taglibs.jsp" %>
+
+<%-- JavaScript for categories table --%> 
+<script type="text/javascript">
+<!-- 
+function setChecked(val) 
+{
+    len = document.categoriesForm.elements.length;
+    var i=0;
+    for( i=0 ; i<len ; i++) 
+    {
+        document.categoriesForm.elements[i].checked=val;
+    }
+}
+function onMove() 
+{
+    if ( confirm("Move selected categories?") ) 
+    {
+        document.categoriesForm.method.value = "moveSelected";
+        document.categoriesForm.submit();
+    }
+}
+//-->
+</script>
+
+<c:choose>
+    <c:when test="${empty model.categoryPath}">
+    <p class="subtitle">
+        <fmt:message key="categoriesForm.subtitle" >
+            <fmt:param value="${model.website.handle}" />
+        </fmt:message>
+    </p>  
+    <p class="pagetip">
+        <fmt:message key="categoriesForm.rootPrompt" />
+    </p> 
+    </c:when>
+    
+    <c:otherwise>
+        <p>
+        <b><fmt:message key="categoriesForm.path" /></b>:
+        <c:forEach var="loopcategory" items="${model.categoryPath}">
+            /
+            <roller:link page="/roller-ui/authoring/categories.do">
+                <roller:linkparam id="method" value="selectCategory" />
+                <roller:linkparam 
+                    id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
+                    name="loopcategory" property="id" />
+                <c:out value="${loopcategory.name}" />
+            </roller:link>
+        </c:forEach>
+        </p>
+        <p><fmt:message key="categoriesForm.categoryPrompt" /></p>
+    </c:otherwise>
+</c:choose>
+
+
+<%-- Form is a table of categories each with checkbox --%>
+
+<html:form action="/roller-ui/authoring/categories" method="post">
+<input type="hidden" name="method" /> 
+<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' /> 
+<html:hidden property="parentId" /> 
+
+<%-- Select-all button --%>
+<input type="button" value="<fmt:message key='categoriesForm.checkAll' />" 
+   onclick="setChecked(1)" /></input>
+
+<%-- Select-none button --%>
+<input type="button" value="<fmt:message key='categoriesForm.checkNone' />" 
+   onclick="setChecked(0)" /></input>
+
+</td>
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+<%-- Move-selected button --%>
+<input type="button" value="<fmt:message key='categoriesForm.move' />"   
+   onclick="onMove()"/></input>
+
+<%-- Move-to combo-box --%>
+<html:select property="moveToCategoryId" size="1">
+    <html:options collection="allCategories" 
+        property="id" labelProperty="path"/>
+</html:select>
+
+<p />
+
+<br />
+
+<table class="rollertable">
+
+    <tr class="rollertable">
+        <th class="rollertable" width="5%">&nbsp;</td>
+        <th class="rollertable" width="5%">&nbsp;</td>
+        <th class="rollertable" width="30%"><fmt:message key="categoriesForm.name" /></td>
+        <th class="rollertable" width="45%"><fmt:message key="categoriesForm.description" /></td>
+        <th class="rollertable" width="5%"><fmt:message key="categoriesForm.edit" /></td>
+        <th class="rollertable" width="5%"><fmt:message key="categoriesForm.remove" /></td>
+    </tr>
+
+    <%-- Categories --%>
+    <c:forEach var="loopcategory" items="${model.category.weblogCategories}" >
+        <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+
+            <td class="rollertable">
+                <html:multibox property="selectedCategories">
+                    <c:out value="${loopcategory.id}" />
+                </html:multibox>
+            </td>
+
+
+            <td class="rollertable" align="center"><img src='<c:url value="/images/folder.png"/>' alt="icon" /></td>
+            
+            <td class="rollertable">
+               <roller:link page="/roller-ui/authoring/categories.do">
+                   <roller:linkparam id="method" value="selectCategory" />
+                   <roller:linkparam 
+                       id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
+                       name="loopcategory" property="id" />
+                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopcategory.name}" /></str:truncateNicely>
+               </roller:link>
+            </td>
+
+            <td class="rollertable">
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopcategory.description}" /></str:truncateNicely>
+            </td>
+
+            <td class="rollertable" align="center">
+               <roller:link page="/roller-ui/authoring/categoryEdit.do">
+                   <roller:linkparam 
+                       id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
+                       name="loopcategory" property="id" />
+                   <img src='<c:url value="/images/page_white_edit.png"/>' border="0" alt="icon" />
+               </roller:link>
+            </td>
+
+            <td class="rollertable" align="center">
+               <roller:link page="/roller-ui/authoring/categoryDelete.do">
+                   <roller:linkparam 
+	                   id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
+	                   name="loopcategory" property="id" />
+                   <roller:linkparam 
+	                   id="method" value="deleteSelected" />
+                   <img src='<c:url value="/images/delete.png"/>' border="0" alt="icon" />
+               </roller:link>
+            </td>
+
+        </roller:row>
+    </c:forEach>
+
+</table>
+
+</html:form>
+

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -28,7 +28,7 @@
 			<%-- Add Category link --%>
 			<p>
             <img src='<c:url value="/images/folder_add.png"/>' border="0"alt="icon" />
-			<roller:link page="/editor/categoryEdit.do">
+			<roller:link page="/roller-ui/authoring/categoryEdit.do">
 			    <roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
 			         name="category" property="id" />
 			    <fmt:message key="categoriesForm.addCategory" />

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp Mon Jun 12 11:49:26 2006
@@ -40,7 +40,7 @@
 [<c:out value="${categoryDeleteForm.name}" />]
 </h3>
 
-<html:form action="/editor/categoryDelete" method="post">
+<html:form action="/roller-ui/authoring/categoryDelete" method="post">
 
 	<html:hidden property="categoryId" />
 	<html:hidden property="confirmDelete" />



Mime
View raw message