roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r537945 [1/4] - in /roller/branches/roller_4.0_newbackend: ./ docs/examples/plugins/ docs/examples/plugins/pluginmodel/ docs/examples/plugins/pluginmodel/src/ docs/examples/plugins/pluginmodel/src/org/ docs/examples/plugins/pluginmodel/src/...
Date Mon, 14 May 2007 18:42:04 GMT
Author: snoopdave
Date: Mon May 14 11:41:57 2007
New Revision: 537945

URL: http://svn.apache.org/viewvc?view=rev&rev=537945
Log:
merging latest from trunk

Added:
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/
      - copied from r537690, roller/trunk/docs/examples/plugins/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/   (props changed)
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/README.html
      - copied unchanged from r537690, roller/trunk/docs/examples/plugins/pluginmodel/README.html
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml
      - copied unchanged from r537690, roller/trunk/docs/examples/plugins/pluginmodel/build.xml
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/roller/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/roller/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/
      - copied from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/
    roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java
      - copied unchanged from r537690, roller/trunk/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryPathComparator.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/pojos/WeblogCategoryPathComparator.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/
      - copied from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CacheInfo.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CacheInfo.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CommonPingTargetAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CommonPingTargetAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CommonPingTargetEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CommonPingTargetEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CommonPingTargets.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CommonPingTargets.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CreateUser.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CreateUser.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/CreateUserBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/CreateUserBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagementBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagementBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalConfig.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/GlobalConfig.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/ModifyUser.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/ModifyUser.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/UserAdmin.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/UserAdmin.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/admin-menu.xml
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/admin/struts2/admin-menu.xml
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/
      - copied from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/BookmarkBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Bookmarks.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Bookmarks.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/BookmarksImport.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarksImport.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Categories.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Categories.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CategoryBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CategoryRemove.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryRemove.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CustomPingTargetAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CustomPingTargetAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CustomPingTargetEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CustomPingTargetEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CustomPingTargets.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/CustomPingTargets.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/FolderBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Maintenance.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Maintenance.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Members.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Members.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/MembersInvite.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/MembersInvite.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Pings.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Pings.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Resources.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Resources.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/TemplateAdd.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateAdd.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/TemplateEditBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEditBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/TemplateRemove.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateRemove.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Templates.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/Templates.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/WeblogConfigForm.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfigForm.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/WeblogRemove.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogRemove.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/
      - copied from r537690, roller/trunk/src/org/apache/roller/ui/common/
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/struts2/
      - copied from r537690, roller/trunk/src/org/apache/roller/ui/common/struts2/
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/struts2/PingTargetAddBase.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/common/struts2/PingTargetAddBase.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/struts2/PingTargetEditBase.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/common/struts2/PingTargetEditBase.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/struts2/PingTargetFormBean.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/common/struts2/PingTargetFormBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/struts2/PingTargetsBase.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/common/struts2/PingTargetsBase.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/
      - copied from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/Menu.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/Menu.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/MenuHelper.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuHelper.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/MenuTab.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuTab.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/MenuTabItem.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/MenuTabItem.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/ParsedMenu.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/ParsedMenu.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/ParsedTab.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/ParsedTab.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/ParsedTabItem.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/menu/ParsedTabItem.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPreparable.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
      - copied unchanged from r537690, roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionPrepareInterceptor.java
    roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/commons-fileupload-1.2.jar
      - copied unchanged from r537690, roller/trunk/tools/struts-2.0.5/lib/commons-fileupload-1.2.jar
    roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/commons-io-1.3.1.jar
      - copied unchanged from r537690, roller/trunk/tools/struts-2.0.5/lib/commons-io-1.3.1.jar
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/
      - copied from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CacheInfo.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CacheInfo.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CommonPingTargetEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargetEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CommonPingTargets.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargets.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/CreateUser.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/CreateUser.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/admin/struts2/UserAdmin.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/
      - copied from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Categories.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Categories.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Maintenance.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Maintenance.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Members.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Members.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Pings.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Pings.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Resources.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Templates.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/menu.jsp
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml
      - copied unchanged from r537690, roller/trunk/web/WEB-INF/web.xml
Removed:
    roller/branches/roller_4.0_newbackend/sandbox/jdobackend/
    roller/branches/roller_4.0_newbackend/sandbox/planetroller/
    roller/branches/roller_4.0_newbackend/sandbox/standalone/
    roller/branches/roller_4.0_newbackend/tools/struts-1.2.4/lib/commons-fileupload.jar
Modified:
    roller/branches/roller_4.0_newbackend/build.xml
    roller/branches/roller_4.0_newbackend/docs/examples/rollertask/   (props changed)
    roller/branches/roller_4.0_newbackend/merges.txt
    roller/branches/roller_4.0_newbackend/metadata/database/droptables.sql
    roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
    roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
    roller/branches/roller_4.0_newbackend/sandbox/   (props changed)
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryData.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/CustomUserRegistry.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetails.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MailUtil.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/UserEntry.java
    roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/TestUtils.java
    roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/UserTest.java
    roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
    roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources_ja_JP.properties
    roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/UserAdmin.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
    roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
    roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css
    roller/branches/roller_4.0_newbackend/web/themes/basic/_day.vm
    roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/_day.vm
    roller/branches/roller_4.0_newbackend/web/themes/frontpage/Weblog.vm
    roller/branches/roller_4.0_newbackend/web/themes/frontpage/_blogprofile.vm
    roller/branches/roller_4.0_newbackend/web/themes/frontpage/_entry.vm
    roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm
    roller/branches/roller_4.0_newbackend/web/themes/sotto/_day.vm

Modified: roller/branches/roller_4.0_newbackend/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/build.xml?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/build.xml Mon May 14 11:41:57 2007
@@ -37,10 +37,9 @@
 <!-- ********************************************************************* -->
 <project name="roller" default="usage">
 
-<!--No longer need java15 check
-<available classname="java.lang.ProcessBuilder" property="java15.present" />
- -->
- 
+<available file="./build/webapp/WEB-INF/dbscripts/derby/createdb.sql" 
+    property="dbscripts-exist" />
+
 <!-- Bring in properties.xml -->
 &properties;
 
@@ -257,12 +256,6 @@
         
         &custom-gen-web;
         
-        <!-- web.xml config -->
-        <deploymentdescriptor servletspec="2.4"
-             destdir="${build.webapp}/WEB-INF"
-             sessiontimeout="30"
-             displayname="Roller Weblogger" />
-        
         <!-- jsp taglib descriptor config -->
         <jsptaglib jspversion="1.2" filename="roller.tld" shortname="roller"
             uri="http://www.rollerweblogger.org/tags"
@@ -385,9 +378,9 @@
     <!-- Copy in resources -->
     <copy todir="${build.compile.web}">
         <fileset dir="${ro.src}">
-            <include name="**/*.properties"/>
-            <include name="**/*.tpl"/>
-            <include name="**/*.vm"/>
+            <exclude name="**/*.java"/>
+            <exclude name="**/*.html"/>
+            <exclude name="**/*.png"/>
         </fileset>
     </copy>
 	
@@ -422,9 +415,9 @@
 <!-- Stage web application -->
 <!-- ********************************************************************* -->
 	
-<target name="stage-webapp" depends="gen-business, build-business, build-web, gen-dbscripts, copy-webapp, gen-web" description="Stage webapp, including jars">
+<target name="stage-webapp" depends="gen-business, build-business, build-web, gen-dbscripts-conditional, copy-webapp, gen-web" description="Stage webapp, including jars">
 </target>
-    
+       
 <target name="copy-webapp" depends="build-web" description="Stage webapp without code generation">
 
     <mkdir dir="${build.webapp}/WEB-INF/lib"/>
@@ -485,11 +478,6 @@
         </fileset>
     </copy>
     
-    <!-- copy database script files -->
-    <copy todir="${build.webapp}/WEB-INF/dbscripts">
-        <fileset dir="${build.dbscripts}" />
-    </copy>
-    
     <!-- apply custom web task -->
     &custom-web;
 
@@ -501,6 +489,10 @@
     <!-- With this approach we won't have to expand the script all the time.   -->
     <!-- ********************************************************************* -->
     
+    <target name="gen-dbscripts-conditional" unless="dbscripts-exist">
+        <antcall target="gen-dbscripts" />
+    </target>
+
     <!-- generate database scripts -->
     <target name="gen-dbscripts">
         

Propchange: roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 14 11:41:57 2007
@@ -0,0 +1,2 @@
+build
+dist

Propchange: roller/branches/roller_4.0_newbackend/docs/examples/rollertask/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 14 11:41:57 2007
@@ -0,0 +1 @@
+logs

Modified: roller/branches/roller_4.0_newbackend/merges.txt
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ roller/branches/roller_4.0_newbackend/merges.txt Mon May 14 11:41:57 2007
@@ -3,7 +3,10 @@
 
 Temporary file to track merges from trunk into the roller_4.0_newbackend branch. 
 
-April 22 2007: merging latest from trunk
+May 14, 2007: merging latest from trunk
+svn merge -r 531174:537690 https://svn.apache.org/repos/asf/roller/trunk
+
+April 22, 2007: merging latest from trunk
 svn merge -r 528650:531174 https://svn.apache.org/repos/asf/roller/trunk
 
 April 12, 2007: merging latest from trunk

Modified: roller/branches/roller_4.0_newbackend/metadata/database/droptables.sql
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/droptables.sql?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/database/droptables.sql (original)
+++ roller/branches/roller_4.0_newbackend/metadata/database/droptables.sql Mon May 14 11:41:57 2007
@@ -21,7 +21,6 @@
 drop table rag_group;
 drop table rag_planet;
 drop table rag_properties;
-drop table rag_config;
 
 -- non-associated tables
 drop table newsfeed;

Modified: roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm (original)
+++ roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm Mon May 14 11:41:57 2007
@@ -33,6 +33,10 @@
 -- new column to support account activation by email
 #addColumnNull("rolleruser" "activationcode" "varchar(48)")
 
+-- new column to support screen name and populate with user names
+#addColumnNotNull("rolleruser" "screenname" "varchar(255)" "'unspecified'")
+update rolleruser set screenname = username;
+
 -- new column to allow setting of page template content-type
 #addColumnNull("webpage" "outputtype" "varchar(48)")
 

Modified: roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm (original)
+++ roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Mon May 14 11:41:57 2007
@@ -19,6 +19,7 @@
     id              varchar(48) not null primary key,
     username        varchar(255) not null,
     passphrase      varchar(255) not null,
+    screenname      varchar(255) not null,
     fullname        varchar(255) not null,
     emailaddress    varchar(255) not null,
     activationcode	varchar(48),

Propchange: roller/branches/roller_4.0_newbackend/sandbox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 14 11:41:57 2007
@@ -0,0 +1 @@
+.DS_Store

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java Mon May 14 11:41:57 2007
@@ -135,35 +135,7 @@
         
         // the main work to be done for a category move is to update the 
         // path attribute of the category and all descendent categories
-        updatePathTree(srcFolder);
-    }
-    
-    
-    // updates the paths of all descendents of the given folder
-    private void updatePathTree(FolderData folder) throws RollerException {
-        
-        log.debug("Updating path tree for folder "+folder.getPath());
-        
-        FolderData childFolder = null;
-        Iterator childFolders = folder.getFolders().iterator();
-        while(childFolders.hasNext()) {
-            childFolder = (FolderData) childFolders.next();
-            
-            log.debug("OLD child folder path was "+childFolder.getPath());
-            
-            // update path and save
-            if("/".equals(folder.getPath())) {
-                childFolder.setPath("/" + childFolder.getName());
-            } else {
-                childFolder.setPath(folder.getPath() + "/" + childFolder.getName());
-            }
-            saveFolder(childFolder);
-            
-            log.debug("NEW child folder path is "+ childFolder.getPath());
-            
-            // then make recursive call to update this folders children
-            updatePathTree(childFolder);
-        }
+        FolderData.updatePathTree(srcFolder);
     }
     
     

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Mon May 14 11:41:57 2007
@@ -857,7 +857,7 @@
                 Query query = session.createQuery(
                     "select count(user) from UserData user where upper(user.userName) like '"+lc.charAt(i)+"%'");
                 List row = query.list();
-                Integer count = (Integer)row.get(0);
+                Number count = (Number) row.get(0);
                 results.put(new String(new char[]{lc.charAt(i)}), count);
             }
             return results;
@@ -899,7 +899,7 @@
                 Query query = session.createQuery(
                     "select count(website) from WebsiteData website where upper(website.handle) like '"+lc.charAt(i)+"%'");
                 List row = query.list();
-                Integer count = (Integer)row.get(0);
+                Number count = (Number)row.get(0);
                 results.put(new String(new char[]{lc.charAt(i)}), count);
             }
             return results;
@@ -963,7 +963,7 @@
                     (String)row[2],                     // website handle
                     (String)row[3],                     // website name
                     "statCount.weblogCommentCountType", // stat type 
-                    new Long(((Integer)row[0]).intValue()).longValue()); // # comments
+                    new Long(((Number)row[0]).longValue())); // # comments
                 statCount.setWeblogHandle((String)row[2]);
                 results.add(statCount);
             }
@@ -984,7 +984,7 @@
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             String query = "select count(distinct w) from WebsiteData w";
             List result = session.createQuery(query).list();
-            ret = ((Integer)result.get(0)).intValue();
+            ret = ((Number)result.get(0)).intValue();
         } catch (Exception e) {
             throw new RollerException(e);
         }
@@ -1015,7 +1015,7 @@
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             String query = "select count(distinct u) from UserData u where u.enabled=true";
             List result = session.createQuery(query).list();
-            ret = ((Integer)result.get(0)).intValue();
+            ret = ((Number)result.get(0)).intValue();
         } catch (Exception e) {
             throw new RollerException(e);
         }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Mon May 14 11:41:57 2007
@@ -149,35 +149,7 @@
         
         // the main work to be done for a category move is to update the 
         // path attribute of the category and all descendent categories
-        updatePathTree(srcCat);
-    }
-    
-    
-    // updates the paths of all descendents of the given category
-    private void updatePathTree(WeblogCategoryData cat) throws RollerException {
-        
-        log.debug("Updating path tree for category "+cat.getPath());
-        
-        WeblogCategoryData childCat = null;
-        Iterator childCats = cat.getWeblogCategories().iterator();
-        while(childCats.hasNext()) {
-            childCat = (WeblogCategoryData) childCats.next();
-            
-            log.debug("OLD child category path was "+childCat.getPath());
-            
-            // update path and save
-            if("/".equals(cat.getPath())) {
-                childCat.setPath("/" + childCat.getName());
-            } else {
-                childCat.setPath(cat.getPath() + "/" + childCat.getName());
-            }
-            saveWeblogCategory(childCat);
-            
-            log.debug("NEW child category path is "+ childCat.getPath());
-            
-            // then make recursive call to update this cats children
-            updatePathTree(childCat);
-        }
+        WeblogCategoryData.updatePathTree(srcCat);
     }
     
     
@@ -1130,7 +1102,7 @@
                     (String)row[2],                             // entry anchor
                     (String)row[3],                             // entry title
                     "statCount.weblogEntryCommentCountType",    // stat desc
-                    new Long(((Integer)row[0]).intValue()).longValue()); // count
+                    new Long(((Number)row[0]).longValue())); // count
                 
                 results.add(statCount);
             }
@@ -1591,7 +1563,7 @@
                 query.setParameter(1, website);
             }
             List result = query.list();
-            ret = ((Integer)result.get(0)).intValue();
+            ret = ((Number)result.get(0)).intValue();
         } catch (Exception e) {
             throw new RollerException(e);
         }
@@ -1626,7 +1598,7 @@
                 query.setParameter(1, website);
             }
             List result = query.list();
-            ret = ((Integer)result.get(0)).intValue();
+            ret = ((Number)result.get(0)).intValue();
         } catch (Exception e) {
             throw new RollerException(e);
         }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java Mon May 14 11:41:57 2007
@@ -25,6 +25,8 @@
 import java.util.TreeSet;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.apache.roller.RollerException;
 import org.apache.roller.business.BookmarkManager;
@@ -49,6 +51,9 @@
     
     public static final long serialVersionUID = -6272468884763861944L;
     
+    private static Log log = LogFactory.getLog(FolderData.class);
+    
+    
     // attributes
     private String id = UUIDGenerator.generateUUID();
     private String name = null;
@@ -360,6 +365,55 @@
         } else {
             // if our path starts with our parents path then we are a descendent
             return this.path.startsWith(ancestor.getPath());
+        }
+    }
+    
+    
+    // convenience method for updating the folder name, which triggers a path tree rebuild
+    public void updateName(String newName) throws RollerException {
+        
+        // update name
+        setName(newName);
+        
+        // calculate path
+        if(getParent() == null) {
+            setPath("/");
+        } else if("/".equals(getParent().getPath())) {
+            setPath("/"+getName());
+        } else {
+            setPath(getParent().getPath() + "/" + getName());
+        }
+        
+        // update path tree for all children
+        updatePathTree(this);
+    }
+    
+    
+    // update the path tree for a given folder
+    public static void updatePathTree(FolderData folder) 
+            throws RollerException {
+        
+        log.debug("Updating path tree for folder "+folder.getPath());
+        
+        FolderData childFolder = null;
+        Iterator childFolders = folder.getFolders().iterator();
+        while(childFolders.hasNext()) {
+            childFolder = (FolderData) childFolders.next();
+            
+            log.debug("OLD child folder path was "+childFolder.getPath());
+            
+            // update path and save
+            if("/".equals(folder.getPath())) {
+                childFolder.setPath("/" + childFolder.getName());
+            } else {
+                childFolder.setPath(folder.getPath() + "/" + childFolder.getName());
+            }
+            RollerFactory.getRoller().getBookmarkManager().saveFolder(childFolder);
+            
+            log.debug("NEW child folder path is "+ childFolder.getPath());
+            
+            // then make recursive call to update this folders children
+            updatePathTree(childFolder);
         }
     }
     

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.java Mon May 14 11:41:57 2007
@@ -59,6 +59,7 @@
     private String  id = UUIDGenerator.generateUUID();
     private String  userName;
     private String  password;
+    private String  screenName;
     private String  fullName;
     private String  emailAddress;
     private Date    dateCreated;
@@ -171,7 +172,22 @@
     public void setPassword( String password ) {
         this.password = password;
     }
-    
+
+    /**
+     * Screen name of the user.
+     *
+     * @roller.wrapPojoMethod type="simple"
+     * @ejb:persistent-field
+     * @hibernate.property column="screenname" non-null="true" unique="true"
+     */
+    public String getScreenName() {
+        return this.screenName;
+    }
+    /** @ejb:persistent-field */
+    public void setScreenName( String screenName ) {
+        this.screenName = screenName;
+    }
+
     /**
      * Full name of the user.
      *
@@ -273,6 +289,7 @@
         this.id =       other.getId();
         this.userName = other.getUserName();
         this.password = other.getPassword();
+        this.screenName = other.getScreenName();
         this.fullName = other.getFullName();
         this.emailAddress = other.getEmailAddress();
         this.locale = other.getLocale();

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryData.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryData.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryData.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogCategoryData.java Mon May 14 11:41:57 2007
@@ -25,6 +25,8 @@
 import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.apache.roller.RollerException;
 import org.apache.roller.business.RollerFactory;
@@ -45,6 +47,9 @@
     
     public static final long serialVersionUID = 1435782148712018954L;
     
+    private static Log log = LogFactory.getLog(WeblogCategoryData.class);
+    
+    
     // attributes
     private String id = UUIDGenerator.generateUUID();
     private String name = null;
@@ -362,5 +367,54 @@
     }
     /** TODO: fix form generation so this is not needed. */
     public void setInUse(boolean dummy) {}
+    
+    
+    // convenience method for updating the category name, which triggers a path tree rebuild
+    public void updateName(String newName) throws RollerException {
+        
+        // update name
+        setName(newName);
+        
+        // calculate path
+        if(getParent() == null) {
+            setPath("/");
+        } else if("/".equals(getParent().getPath())) {
+            setPath("/"+getName());
+        } else {
+            setPath(getParent().getPath() + "/" + getName());
+        }
+        
+        // update path tree for all children
+        updatePathTree(this);
+    }
+    
+    
+    // updates the paths of all descendents of the given category
+    public static void updatePathTree(WeblogCategoryData cat) 
+            throws RollerException {
+        
+        log.debug("Updating path tree for category "+cat.getPath());
+        
+        WeblogCategoryData childCat = null;
+        Iterator childCats = cat.getWeblogCategories().iterator();
+        while(childCats.hasNext()) {
+            childCat = (WeblogCategoryData) childCats.next();
+            
+            log.debug("OLD child category path was "+childCat.getPath());
+            
+            // update path and save
+            if("/".equals(cat.getPath())) {
+                childCat.setPath("/" + childCat.getName());
+            } else {
+                childCat.setPath(cat.getPath() + "/" + childCat.getName());
+            }
+            RollerFactory.getRoller().getWeblogManager().saveWeblogCategory(childCat);
+            
+            log.debug("NEW child category path is "+ childCat.getPath());
+            
+            // then make recursive call to update this cats children
+            updatePathTree(childCat);
+        }
+    }
     
 }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java Mon May 14 11:41:57 2007
@@ -57,6 +57,16 @@
      *
      * Simply returns the same value that the pojo would have returned.
      */
+    public java.lang.String getScreenName()
+    {
+        return this.pojo.getScreenName();
+    }
+
+    /**
+     * pojo method tagged with @roller.wrapPojoMethod type="simple"
+     *
+     * Simply returns the same value that the pojo would have returned.
+     */
     public java.lang.String getFullName()
     {   
         return this.pojo.getFullName();

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/CustomUserRegistry.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/CustomUserRegistry.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/CustomUserRegistry.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/CustomUserRegistry.java Mon May 14 11:41:57 2007
@@ -41,11 +41,13 @@
     
     private static Log log = LogFactory.getLog(CustomUserRegistry.class);
     
+    private static String DEFAULT_SNAME_LDAP_ATTRIBUTE = "screenname";
     private static String DEFAULT_NAME_LDAP_ATTRIBUTE = "cn";
     private static String DEFAULT_EMAIL_LDAP_ATTRIBUTE = "mail";
     private static String DEFAULT_LOCALE_LDAP_ATTRIBUTE = "locale";
     private static String DEFAULT_TIMEZONE_LDAP_ATTRIBUTE = "timezone";
     
+    private static String SNAME_LDAP_PROPERTY = "users.sso.registry.ldap.attributes.screenname";
     private static String NAME_LDAP_PROPERTY = "users.sso.registry.ldap.attributes.name";
     private static String EMAIL_LDAP_PROPERTY = "users.sso.registry.ldap.attributes.email";
     private static String LOCALE_LDAP_PROPERTY = "users.sso.registry.ldap.attributes.locale";
@@ -100,7 +102,11 @@
         if(userDetails instanceof RollerUserDetails) {
             RollerUserDetails rollerDetails = (RollerUserDetails) userDetails;
             
+            ud.setScreenName(rollerDetails.getScreenName());
+            
             ud.setFullName(rollerDetails.getFullName());
+
+            //TODO: Bug here as setting email addy to a full name value?
             ud.setEmailAddress(rollerDetails.getFullName());
             if(rollerDetails.getTimeZone() != null) {
                 ud.setTimeZone(rollerDetails.getTimeZone());
@@ -113,9 +119,11 @@
         } else if(userDetails instanceof LdapUserDetails) {
             LdapUserDetails ldapDetails = (LdapUserDetails) userDetails;
             Attributes attributes = ldapDetails.getAttributes();
+            String sname = getLdapAttribute(attributes, RollerConfig.getProperty(SNAME_LDAP_PROPERTY, DEFAULT_SNAME_LDAP_ATTRIBUTE));
             String name = getLdapAttribute(attributes, RollerConfig.getProperty(NAME_LDAP_PROPERTY, DEFAULT_NAME_LDAP_ATTRIBUTE));
             String email = getLdapAttribute(attributes, RollerConfig.getProperty(EMAIL_LDAP_PROPERTY, DEFAULT_EMAIL_LDAP_ATTRIBUTE));
-            
+
+            ud.setScreenName(sname);
             ud.setFullName(name);
             ud.setEmailAddress(email);
             

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetails.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetails.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetails.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetails.java Mon May 14 11:41:57 2007
@@ -32,8 +32,10 @@
   
   public String getLocale();
   
+  public String getScreenName();
+
   public String getFullName();
-  
+
   public String getEmailAddress();
   
 }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/YourProfileAction.java Mon May 14 11:41:57 2007
@@ -134,6 +134,7 @@
                 UserData data = rollerSession.getAuthenticatedUser();
                 
                 // We want to be VERY selective about what data gets updated
+                data.setScreenName(form.getScreenName());
                 data.setFullName(form.getFullName());
                 data.setEmailAddress(form.getEmailAddress());
                 data.setLocale(form.getLocale());

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java Mon May 14 11:41:57 2007
@@ -82,6 +82,7 @@
             UserData existingUser = getAuthenticatedUser();
             
             // We want to be VERY selective about what data gets updated
+            existingUser.setScreenName(getBean().getScreenName());
             existingUser.setFullName(getBean().getFullName());
             existingUser.setEmailAddress(getBean().getEmailAddress());
             existingUser.setLocale(getBean().getLocale());

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java Mon May 14 11:41:57 2007
@@ -51,7 +51,7 @@
     
     private static Log log = LogFactory.getLog(RegisterForm.class);
     
-    protected static String DEFAULT_ALLOWED_CHARS = "A-Za-z0-9";
+    public static String DEFAULT_ALLOWED_CHARS = "A-Za-z0-9";
     
     // this is a no-no, we should not need this
     private HttpServletRequest servletRequest = null;
@@ -81,9 +81,11 @@
     
     public String execute() {
         
+        if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
+            return "disabled";
+        }
+        
         try {
-            getBean().setPasswordText(null);
-            getBean().setPasswordConfirm(null);
             getBean().setLocale(Locale.getDefault().toString());
             getBean().setTimeZone(TimeZone.getDefault().getID());
             
@@ -114,10 +116,7 @@
     
     public String save() {
         
-        boolean reg_allowed =
-                RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
-        
-        if ( !reg_allowed ) {
+        if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
             return "disabled";
         }
         
@@ -245,7 +244,7 @@
     
     
     // TODO: replace with struts2 validation
-    private void myValidate() {
+    protected void myValidate() {
         
         // if usingSSO, we don't want to error on empty password/username from HTML form.
         setFromSS0(false);

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java Mon May 14 11:41:57 2007
@@ -29,192 +29,120 @@
  */
 public class RegisterFormBean {
     
-    protected java.lang.Boolean enabled;
-    protected java.lang.String id;
-    protected java.lang.String userName;
-    protected java.lang.String password;
-    protected java.lang.String fullName;
-    protected java.lang.String emailAddress;
-    protected java.lang.String locale;
-    protected java.lang.String timeZone;
-    protected java.lang.String activationCode;
-    private String mPasswordText = null;
-    private String mPasswordConfirm = null;
+    private String id = null;
+    private String userName = null;
+    private String password = null;
+    private String screenName = null;
+    private String fullName = null;
+    private String emailAddress = null;
+    private String locale = null;
+    private String timeZone = null;
+    
+    private String passwordText = null;
+    private String passwordConfirm = null;
     
     
-    public java.lang.Boolean getEnabled() {
-        return this.enabled;
+    public String getId() {
+        return id;
     }
-    
-    /**
-     */
-    public void setEnabled( java.lang.Boolean enabled ) {
-        this.enabled = enabled;
-    }
-    
-    public java.lang.String getId() {
-        return this.id;
-    }
-    
-    /**
-     * @struts.validator type="required" msgkey="errors.required"
-     */
-    public void setId( java.lang.String id ) {
+
+    public void setId(String id) {
         this.id = id;
     }
-    
-    public java.lang.String getUserName() {
-        return this.userName;
+
+    public String getUserName() {
+        return userName;
     }
-    
-    /**
-     */
-    public void setUserName( java.lang.String userName ) {
+
+    public void setUserName(String userName) {
         this.userName = userName;
     }
-    
-    public java.lang.String getPassword() {
-        return this.password;
+
+    public String getPassword() {
+        return password;
     }
-    
-    /**
-     */
-    public void setPassword( java.lang.String password ) {
+
+    public void setPassword(String password) {
         this.password = password;
     }
-    
-    public java.lang.String getFullName() {
-        return this.fullName;
+
+    public String getScreenName() {
+        return screenName;
+    }
+
+    public void setScreenName(String screenName) {
+        this.screenName = screenName;
+    }
+
+    public String getFullName() {
+        return fullName;
     }
-    
-    /**
-     */
-    public void setFullName( java.lang.String fullName ) {
+
+    public void setFullName(String fullName) {
         this.fullName = fullName;
     }
-    
-    public java.lang.String getEmailAddress() {
-        return this.emailAddress;
+
+    public String getEmailAddress() {
+        return emailAddress;
     }
-    
-    /**
-     */
-    public void setEmailAddress( java.lang.String emailAddress ) {
+
+    public void setEmailAddress(String emailAddress) {
         this.emailAddress = emailAddress;
     }
-    
-    public java.lang.String getLocale() {
-        return this.locale;
+
+    public String getLocale() {
+        return locale;
     }
-    
-    /**
-     */
-    public void setLocale( java.lang.String locale ) {
+
+    public void setLocale(String locale) {
         this.locale = locale;
     }
-    
-    public java.lang.String getTimeZone() {
-        return this.timeZone;
+
+    public String getTimeZone() {
+        return timeZone;
     }
-    
-    /**
-     */
-    public void setTimeZone( java.lang.String timeZone ) {
+
+    public void setTimeZone(String timeZone) {
         this.timeZone = timeZone;
     }
     
-    public java.lang.String getActivationCode() {
-        return this.activationCode;
-    }
-    
-    /**
-     */
-    public void setActivationCode( java.lang.String activationCode ) {
-        this.activationCode = activationCode;
-    }
-    
-    /**
-     * Don't call it "password" because browser will autofill.
-     * @return Returns the passwordText.
-     */
     public String getPasswordText() {
-        return mPasswordText;
+        return passwordText;
     }
-    
-    /**
-     * Don't call it "password" because browser will autofill.
-     * @param passwordText The passwordText to set.
-     */
+
     public void setPasswordText(String passwordText) {
-        mPasswordText = passwordText;
+        this.passwordText = passwordText;
     }
-    
-    /**
-     * @return Returns the passwordConfirm.
-     */
+
     public String getPasswordConfirm() {
-        return mPasswordConfirm;
+        return passwordConfirm;
     }
-    
-    /**
-     * @param passwordConfirm The passwordConfirm to set.
-     */
+
     public void setPasswordConfirm(String passwordConfirm) {
-        mPasswordConfirm = passwordConfirm;
+        this.passwordConfirm = passwordConfirm;
     }
     
     
-    /**
-     * Copy values from this form bean to the specified data object.
-     * Only copies primitive types (Boolean, boolean, String, Integer, int, Timestamp, Date)
-     */
     public void copyTo(UserData dataHolder, Locale locale) {
         
-        dataHolder.setEnabled(this.enabled);
-        dataHolder.setId(this.id);
-        dataHolder.setUserName(this.userName);
+        dataHolder.setScreenName(this.screenName);
         dataHolder.setFullName(this.fullName);
         dataHolder.setEmailAddress(this.emailAddress);
         dataHolder.setLocale(this.locale);
         dataHolder.setTimeZone(this.timeZone);
-        
-        dataHolder.setActivationCode(this.activationCode);
     }
     
     
-    /**
-     * Copy values from specified data object to this form bean.
-     * Includes all types.
-     */
     public void copyFrom(UserData dataHolder, Locale locale) {
         
-        this.enabled = dataHolder.getEnabled();
         this.id = dataHolder.getId();
         this.userName = dataHolder.getUserName();
         this.password = dataHolder.getPassword();
+        this.screenName = dataHolder.getScreenName();
         this.fullName = dataHolder.getFullName();
         this.emailAddress = dataHolder.getEmailAddress();
         this.locale = dataHolder.getLocale();
         this.timeZone = dataHolder.getTimeZone();
-        
-        this.activationCode = dataHolder.getActivationCode();
-        
-    }
-    
-    
-    public void doReset() {
-        
-        this.enabled = null;
-        this.id = null;
-        this.userName = null;
-        this.password = null;
-        this.fullName = null;
-        this.emailAddress = null;
-        this.locale = null;
-        this.timeZone = null;
-        
-        this.activationCode = null;
-        
     }
     
 }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java Mon May 14 11:41:57 2007
@@ -29,6 +29,7 @@
 import java.util.TreeMap;
 import org.apache.roller.util.LocaleComparator;
 
+
 /**
  * A utilities class used by the Weblogger UI.
  */

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java Mon May 14 11:41:57 2007
@@ -24,9 +24,12 @@
 import java.util.List;
 import org.apache.roller.config.RollerConfig;
 import org.apache.roller.config.RollerRuntimeConfig;
+import org.apache.roller.pojos.PermissionsData;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.util.UIUtils;
+import org.apache.roller.ui.core.util.menu.Menu;
+import org.apache.roller.ui.core.util.menu.MenuHelper;
 
 
 /**
@@ -39,7 +42,10 @@
  * getText(key) on the param passed into setError() and setSuccess().
  */
 public abstract class UIAction extends ActionSupport 
-        implements UISecurityEnforced {
+        implements UIActionPreparable, UISecurityEnforced {
+    
+    // a common result name used to indicate the result should list some data
+    public static final String LIST = "list";
     
     // the authenticated user accessing this action, or null if client is not logged in
     private UserData authenticatedUser = null;
@@ -47,10 +53,24 @@
     // the weblog this action is intended to work on, or null if no weblog specified
     private WebsiteData actionWeblog = null;
     
+    // the weblog handle of the action weblog
+    private String weblog = null;
+    
+    // action name (used by tabbed menu utility)
+    protected String actionName = null;
+    
+    // the name of the menu this action wants to show, or null for no menu
+    protected String desiredMenu = null;
+    
     // page title
     protected String pageTitle = null;
     
     
+    public void myPrepare() {
+        // no-op
+    }
+    
+    
     // default action permissions, user is required
     public boolean isUserRequired() {
         return true;
@@ -61,12 +81,12 @@
         return true;
     }
     
-    // default action permissions, no role required
+    // default action permissions, "editor" role required
     public String requiredUserRole() {
-        return null;
+        return "editor";
     }
     
-    // default action permissions, no weblog permissions required
+    // default action permissions, no perms required
     public short requiredWeblogPermissions() {
         return -1;
     }
@@ -119,6 +139,10 @@
         addActionError(getText(errorKey, errorKey, param));
     }
     
+    public void addError(String errorKey, List args) {
+        addActionError(getText(errorKey, args));
+    }
+    
     /**
      * This simply returns the result of hasActionErrors() but we need it
      * because without it you can't easily check if there were errors since
@@ -137,6 +161,10 @@
         addActionMessage(getText(msgKey, msgKey, param));
     }
     
+    public void addMessage(String msgKey, List args) {
+        addActionMessage(getText(msgKey, args));
+    }
+    
     /**
      * This simply returns the result of hasActionMessages() but we need it
      * because without it you can't easily check if there were messages since
@@ -163,12 +191,41 @@
         this.actionWeblog = workingWeblog;
     }
 
+    public String getWeblog() {
+        return weblog;
+    }
+
+    public void setWeblog(String weblog) {
+        this.weblog = weblog;
+    }
+    
     public String getPageTitle() {
         return getText(pageTitle);
     }
 
     public void setPageTitle(String pageTitle) {
         this.pageTitle = pageTitle;
+    }
+    
+    
+    public String getActionName() {
+        return this.actionName;
+    }
+    
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
+
+    public String getDesiredMenu() {
+        return desiredMenu;
+    }
+
+    public void setDesiredMenu(String desiredMenu) {
+        this.desiredMenu = desiredMenu;
+    }
+    
+    public Menu getMenu() {
+        return MenuHelper.getMenu(getDesiredMenu(), getActionName(), getAuthenticatedUser(), getActionWeblog());
     }
     
     

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java Mon May 14 11:41:57 2007
@@ -1,10 +1,19 @@
 /*
- * UIActionInterceptor.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Created on April 16, 2007, 5:30 PM
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.apache.roller.ui.core.util.struts2;
@@ -54,16 +63,19 @@
             theAction.setAuthenticatedUser(rses.getAuthenticatedUser());
             
             // extract the work weblog and set it
-            String weblogHandle = request.getParameter(RequestConstants.WEBLOG_ID);
+            String weblogHandle = theAction.getWeblog();
+            //String weblogHandle = request.getParameter(RequestConstants.WEBLOG);
             if(!StringUtils.isEmpty(weblogHandle)) {
                 WebsiteData weblog = null;
                 try {
                     UserManager mgr = RollerFactory.getRoller().getUserManager();
                     weblog = mgr.getWebsiteByHandle(weblogHandle);
+                    if(weblog != null) {
+                        theAction.setActionWeblog(weblog);
+                    }
                 } catch(Exception e) {
-                    
+                    log.error("Error looking up action weblog - "+weblogHandle, e);
                 }
-                theAction.setActionWeblog(weblog);
             }
         }
         

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java Mon May 14 11:41:57 2007
@@ -1,10 +1,19 @@
 /*
- * UISecurityEnforced.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Created on April 17, 2007, 8:24 AM
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.apache.roller.ui.core.util.struts2;

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java Mon May 14 11:41:57 2007
@@ -1,10 +1,19 @@
 /*
- * UIActionInterceptor.java
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Created on April 16, 2007, 5:30 PM
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.apache.roller.ui.core.util.struts2;
@@ -21,6 +30,7 @@
 import org.apache.roller.ui.core.RequestConstants;
 import org.apache.roller.ui.core.RollerSession;
 
+
 /**
  * A struts2 interceptor for configuring specifics of the weblogger ui.
  */
@@ -54,8 +64,8 @@
                 
                 // are we also enforcing a specific role?
                 if(theAction.requiredUserRole() != null) {
-                    log.debug("DENIED: user does not have role = "+theAction.requiredUserRole());
                     if(!authenticatedUser.hasRole(theAction.requiredUserRole())) {
+                        log.debug("DENIED: user does not have role = "+theAction.requiredUserRole());
                         return "access-denied";
                     }
                 }

Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Mon May 14 11:41:57 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.servlets;
+package org.apache.roller.ui.rendering.servlets;  
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -500,7 +500,7 @@
             for (Iterator it = messages.getMessages(); it.hasNext();) {
                 RollerMessage rollerMessage = (RollerMessage)it.next();
                 ownermsg.append((escapeHtml) ? "" : "<li>");
-                ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()), rollerMessage.getArgs()) );
+                ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()), (Object[])rollerMessage.getArgs()) );
                 ownermsg.append((escapeHtml) ? "\n\n" : "</li>");
             }
             if (messages.getMessageCount() > 0) {
@@ -517,7 +517,7 @@
             for (Iterator it = messages.getErrors(); it.hasNext();) {
                 RollerMessage rollerMessage = (RollerMessage)it.next();
                 ownermsg.append((escapeHtml) ? "" : "<li>");
-                ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()), rollerMessage.getArgs()) );
+                ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()), (Object[])rollerMessage.getArgs()) );
                 ownermsg.append((escapeHtml) ? "\n\n" : "</li>");
             }
             if (messages.getErrorCount() > 0) {



Mime
View raw message