You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2012/06/24 16:13:01 UTC
svn commit: r1353270 [1/2] - in /roller/trunk: ./ weblogger-business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/
weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/
weblogger-business/src/main/java...
Author: snoopdave
Date: Sun Jun 24 14:12:52 2012
New Revision: 1353270
URL: http://svn.apache.org/viewvc?rev=1353270&view=rev
Log:
Merging Roller 5.0.1 security fixes into trunk
Added:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-business/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_11a85032.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_11a85032.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_1b46346b.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_1b46346b.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_1eb2652e.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_1eb2652e.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_1f0283f5.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_1f0283f5.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_20db9c3c.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_20db9c3c.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_23d8def1.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_23d8def1.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_23e1fe0a.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_23e1fe0a.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_2449aa35.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_2449aa35.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_2bf00c9b.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_2bf00c9b.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_2d80bcdd.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_2d80bcdd.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_2e29d3f7.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_2e29d3f7.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_34c451cb.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_34c451cb.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_3802e611.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_3802e611.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_3865ba93.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_3865ba93.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_3934bc1e.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_3934bc1e.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_393f65c3.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_393f65c3.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_41008a03.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_41008a03.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_42faaf5d.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_42faaf5d.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_489c55d0.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_489c55d0.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_490f4977.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_490f4977.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_4a11d5eb.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_4a11d5eb.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_4ab2e870.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_4ab2e870.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_52c9a606.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_52c9a606.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_64ea6998.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_64ea6998.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_654b2b4c.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_654b2b4c.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_657b957.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_657b957.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_6971e1a1.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_6971e1a1.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_6fca17be.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_6fca17be.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_79ee0277.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_79ee0277.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_a7f8184.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_a7f8184.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_e944608.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_e944608.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_f4c95c8.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_f4c95c8.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m1204a8e0.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m1204a8e0.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m1f925a7c.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m1f925a7c.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m23b7889.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m23b7889.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m2bce0884.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m2bce0884.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m2c31c7e2.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m2c31c7e2.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3040f985.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3040f985.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m345e13a6.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m345e13a6.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m36e0a4f0.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m36e0a4f0.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3972b402.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3972b402.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3c27d119.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m3c27d119.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m46d9271a.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m46d9271a.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m4d81d8c7.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m4d81d8c7.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m4f9a6d72.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m4f9a6d72.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m54826513.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m54826513.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m57e66622.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m57e66622.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m5ece824b.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m5ece824b.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m6222e3cf.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m6222e3cf.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m6249aad7.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m6249aad7.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m692eea30.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m692eea30.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m718d022f.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m718d022f.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_m8d76424.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_m8d76424.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_mab1b680.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_mab1b680.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_mc01c96b.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_mc01c96b.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_mc7181a0.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_mc7181a0.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_md0655a4.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_md0655a4.png
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide_html_mffbe88b.png
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-docs/installguide/generated/html/roller-install-guide_html_mffbe88b.png
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
- copied unchanged from r1343069, roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
Modified:
roller/trunk/ (props changed)
roller/trunk/README.txt
roller/trunk/pom.xml
roller/trunk/sign-javaee-release.sh
roller/trunk/sign-jboss-release.sh
roller/trunk/sign-tomcat-release.sh
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/ (props changed)
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ (props changed)
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (contents, props changed)
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/ (props changed)
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties (contents, props changed)
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf
roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/ (props changed)
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Register.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml
roller/trunk/weblogger-webapp/src/test/resources/jetty.xml
roller/trunk/weblogger-webapp/src/test/resources/roller-custom.properties
Propchange: roller/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 24 14:12:52 2012
@@ -1,14 +1,15 @@
+roller-forms.txt
+roller-project.iws
+.idea
+roller-project.ipr
+build
+roller-project.iml
+.settings
velocity.log
roller-startup.log
tomcat
-.idea
+target
classes.eclipse
-build
dist-roller-weblogger-5.0-RC1
-roller-project.iml
-dist
-.settings
out
-roller-project.ipr
-roller-project.iws
-target
+dist
Propchange: roller/trunk/
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0:r1103970-1343069
Modified: roller/trunk/README.txt
URL: http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/README.txt (original)
+++ roller/trunk/README.txt Sun Jun 24 14:12:52 2012
@@ -23,7 +23,7 @@ Building this version of Roller requires
- To build and run Roller on Eclipse: https://cwiki.apache.org/confluence/x/EM4
---------------------------
-BUILDING FOR TOMCAT
+BUILDING FOR APACHE TOMCAT
The normal Roller build creates a product suitable for use on Tomcat 6 or later,
which includes OpenJPA bytecode enhancement, OpenJPA and other Java EE jars.
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sun Jun 24 14:12:52 2012
@@ -1,4 +1,3 @@
-
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Modified: roller/trunk/sign-javaee-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-javaee-release.sh?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/sign-javaee-release.sh (original)
+++ roller/trunk/sign-javaee-release.sh Sun Jun 24 14:12:52 2012
@@ -1,5 +1,5 @@
-export rcstring="-RC5"
-export vstring="5.0.0"
+export rcstring=""
+export vstring="5.1"
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-javaee.tar.gz
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-javaee.zip
Modified: roller/trunk/sign-jboss-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-jboss-release.sh?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/sign-jboss-release.sh (original)
+++ roller/trunk/sign-jboss-release.sh Sun Jun 24 14:12:52 2012
@@ -1,5 +1,5 @@
-export rcstring="-RC5"
-export vstring="5.0.0"
+export rcstring=""
+export vstring="5.1"
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-jboss.tar.gz
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-jboss.zip
Modified: roller/trunk/sign-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-tomcat-release.sh?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/sign-tomcat-release.sh (original)
+++ roller/trunk/sign-tomcat-release.sh Sun Jun 24 14:12:52 2012
@@ -1,5 +1,5 @@
-export rcstring="-RC5"
-export vstring="5.0.0"
+export rcstring=""
+export vstring="5.1"
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.tar.gz
gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.zip
Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sun Jun 24 14:12:52 2012
@@ -196,7 +196,12 @@
<artifactId>derbyclient</artifactId>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.3.1</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
<build>
Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-business/src/main/java/org/apache/roller/weblogger/business:r1103970-1343069
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java Sun Jun 24 14:12:52 2012
@@ -32,6 +32,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.business.plugins.comment.WeblogEntryCommentPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
/**
@@ -85,11 +86,12 @@ public class PluginManagerImpl implement
return ret;
}
-
public String applyWeblogEntryPlugins(Map pagePlugins,WeblogEntry entry, String str) {
+
String ret = str;
WeblogEntry copy = new WeblogEntry(entry);
List entryPlugins = copy.getPluginsList();
+
if (entryPlugins != null && !entryPlugins.isEmpty()) {
Iterator iter = entryPlugins.iterator();
while (iter.hasNext()) {
@@ -102,7 +104,8 @@ public class PluginManagerImpl implement
}
}
}
- return ret;
+
+ return HTMLSanitizer.conditionallySanitize(ret);
}
Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:r1103970-1343069
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sun Jun 24 14:12:52 2012
@@ -28,7 +28,6 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -54,6 +53,8 @@ import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.WebloggerConfig;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
import org.apache.roller.weblogger.util.Utilities;
/**
@@ -1172,8 +1173,8 @@ public class WeblogEntry implements Seri
}
}
}
- }
- return ret;
+ }
+ return HTMLSanitizer.conditionallySanitize(ret);
}
@@ -1220,7 +1221,7 @@ public class WeblogEntry implements Seri
}
}
- return displayContent;
+ return HTMLSanitizer.conditionallySanitize(displayContent);
}
Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:r1103970-1343069
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java Sun Jun 24 14:12:52 2012
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.pojo
import java.util.Date;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
/**
@@ -59,12 +60,12 @@ public class UserWrapper {
public String getScreenName() {
- return this.pojo.getScreenName();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getScreenName());
}
public String getFullName() {
- return this.pojo.getFullName();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getFullName());
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java Sun Jun 24 14:12:52 2012
@@ -30,6 +30,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogEntryTag;
import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
/**
@@ -99,12 +100,12 @@ public class WeblogEntryWrapper {
public String getTitle() {
- return this.pojo.getTitle();
- }
-
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getTitle());
+ }
+
public String getSummary() {
- return this.pojo.getSummary();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getSummary());
}
/**
@@ -113,7 +114,7 @@ public class WeblogEntryWrapper {
* Simply returns the same value that the pojo would have returned.
*/
public String getText() {
- return this.pojo.getText();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getText());
}
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java Sun Jun 24 14:12:52 2012
@@ -22,6 +22,7 @@ import org.apache.commons.lang.StringEsc
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.pojos.*;
+import org.apache.roller.weblogger.util.HTMLSanitizer;
import java.util.*;
@@ -109,7 +110,7 @@ public class WeblogWrapper {
public String getDescription() {
- return this.pojo.getDescription();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getDescription());
}
@@ -289,7 +290,7 @@ public class WeblogWrapper {
public String getAbout() {
- return this.pojo.getAbout();
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getAbout());
}
Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-business/src/main/java/org/apache/roller/weblogger/util:r1103970-1343069
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sun Jun 24 14:12:52 2012
@@ -344,6 +344,11 @@ cache.planet.enabled=true
cache.planet.size=10
cache.planet.timeout=1800
+# Salt cache (XSRF protection)
+cache.salt.enabled=true
+cache.salt.size=5000
+cache.salt.timeout=3600
+
#-----------------------------------------------------------------------------
# Security settings
Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties:r1103970-1343069
Modified: roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html (original)
+++ roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html Sun Jun 24 14:12:52 2012
@@ -1,180 +1,2270 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!--This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info.--><head profile="http://dublincore.org/documents/dcmi-terms/"><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language" content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source" content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued" content="2007-07-06T11:18:20" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.modified" content="2011-05-08T14:49:00" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content="" xml:lang="en-US"/><meta name="DCTERMS.subject" content=", OpenDS Directory Server Administration Framework" xml:lang="en-US"/><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" hreflang="en"/><link rel="schema.DCTER
MS" href="http://purl.org/dc/terms/" hreflang="en"/><link rel="schema.DCTYPE" href="http://purl.org/dc/dcmitype/" hreflang="en"/><link rel="schema.DCAM" href="http://purl.org/dc/dcam/" hreflang="en"/><base href="."/><style type="text/css">
- @page { }
- table { border-collapse:collapse; border-spacing:0; empty-cells:show }
- td, th { vertical-align:top; font-size:12pt;}
- h1, h2, h3, h4, h5, h6 { clear:both }
- ol, ul { margin:0; padding:0;}
- li { list-style: none; margin:0; padding:0;}
- <!-- "li span.odfLiEnd" - IE 7 issue-->
- li span. { clear: both; line-height:0; width:0; height:0; margin:0; padding:0; }
- span.footnodeNumber { padding-right:1em; }
- span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000; margin:0; border:0; padding:0; }
- * { margin:0;}
- .fr1 { font-size:12pt; text-align:right; vertical-align:top; writing-mode:lr-tb; }
- .fr2 { font-size:12pt; vertical-align:top; writing-mode:lr-tb; background-color:transparent; }
- .fr3 { font-size:12pt; vertical-align:top; writing-mode:lr-tb; }
- .fr4 { font-size:12pt; vertical-align:top; writing-mode:lr-tb; }
- .fr5 { font-size:12pt; vertical-align:top; writing-mode:lr-tb; }
- .Contents_20_1 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0in; margin-right:0in; text-indent:0in; font-weight:bold; }
- .Contents_20_10 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:1.7689in; margin-right:0in; text-indent:0in; }
- .Contents_20_2 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.1965in; margin-right:0in; text-indent:0in; }
- .Contents_20_3 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.3929in; margin-right:0in; text-indent:0in; }
- .Contents_20_4 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.5898in; margin-right:0in; text-indent:0in; }
- .Contents_20_5 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.7862in; margin-right:0in; text-indent:0in; }
- .Contents_20_6 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.9827in; margin-right:0in; text-indent:0in; }
- .Contents_20_7 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:1.1791in; margin-right:0in; text-indent:0in; }
- .Contents_20_8 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:1.3756in; margin-right:0in; text-indent:0in; }
- .Contents_20_9 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-left:1.572in; margin-right:0in; text-indent:0in; }
- .Contents_20_Heading { font-size:16pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; margin-left:0in; margin-right:0in; text-indent:0in; }
- .Heading_20_1_borderStart { font-size:22pt; font-weight:bold; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; padding:0in; border-left-style:none; border-right-style:none; border-top-style:none; font-style:italic; padding-bottom:0.0835in; border-bottom-style:none; }
- .Heading_20_1 { font-size:22pt; font-weight:bold; font-family:Helvetica; writing-mode:lr-tb; padding:0in; border-left-style:none; border-right-style:none; font-style:italic; padding-bottom:0.0835in; padding-top:0.1665in; border-top-style:none; border-bottom-style:none; }
- .Heading_20_1_borderEnd { font-size:22pt; font-weight:bold; margin-bottom:0.0835in; font-family:Helvetica; writing-mode:lr-tb; padding:0in; border-left-style:none; border-right-style:none; border-bottom-width:0.0879cm; border-bottom-style:solid; border-bottom-color:#000000; font-style:italic; padding-top:0.1665in; border-top-style:none;}
- .Heading_20_2 { font-size:18pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; font-style:italic; }
- .Heading_20_4 { font-size:14pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica Bold; writing-mode:lr-tb; font-style:italic; }
- .P10_borderStart { font-size:13pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-bottom:0in; border-bottom-style:none; }
- .P10 { font-size:13pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P10_borderEnd { font-size:13pt; margin-bottom:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-top:0in; border-top-style:none;}
- .P11 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P12 { font-size:14pt; font-style:italic; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica Bold; writing-mode:lr-tb; }
- .P13 { font-size:8pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P14 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P15 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-style:italic; font-weight:bold; }
- .P16 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-weight:bold; }
- .P17 { font-size:16pt; font-weight:bold; margin-bottom:0.0835in; margin-left:0in; margin-right:0in; margin-top:0.1665in; text-indent:0in; font-family:Helvetica; writing-mode:lr-tb; }
- .P18_borderStart { border-left-style:none; border-right-style:none; border-top-style:none; font-size:12pt; font-style:oblique; font-weight:bold; padding:0in; text-align:left ! important; font-family:Helvetica; writing-mode:lr-tb; border-bottom-style:none; }
- .P18 { border-left-style:none; border-right-style:none; font-size:12pt; font-style:oblique; font-weight:bold; padding:0in; text-align:left ! important; font-family:Helvetica; writing-mode:lr-tb; border-top-style:none; border-bottom-style:none; }
- .P18_borderEnd { border-bottom-width:0.0879cm; border-bottom-style:solid; border-bottom-color:#000000; border-left-style:none; border-right-style:none; font-size:12pt; font-style:oblique; font-weight:bold; padding:0in; text-align:left ! important; font-family:Helvetica; writing-mode:lr-tb; border-top-style:none;}
- .P19 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; }
- .P20 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-top:0in; margin-bottom:0.1965in; text-align:left ! important; }
- .P21 { font-size:11pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P22 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P23 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P24_borderStart { font-size:12pt; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-bottom:0in; border-bottom-style:none; }
- .P24 { font-size:12pt; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P24_borderEnd { font-size:12pt; margin-bottom:0in; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-top:0in; border-top-style:none;}
- .P25_borderStart { font-size:14pt; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-bottom:0in; border-bottom-style:none; }
- .P25 { font-size:14pt; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P25_borderEnd { font-size:14pt; margin-bottom:0in; font-family:Courier New; writing-mode:lr-tb; background-color:transparent; padding-top:0in; border-top-style:none;}
- .P26 { font-size:11pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P27 { font-size:8pt; margin-bottom:0in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P28 { font-size:14pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland; writing-mode:lr-tb; }
- .P29 { font-size:14pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland; writing-mode:lr-tb; font-style:italic; font-weight:bold; }
- .P3 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; }
- .P30 { font-size:10pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland; writing-mode:lr-tb; }
- .P31_borderStart { font-size:12pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-bottom:0.0835in; border-bottom-style:none; }
- .P31 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-bottom:0.0835in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P31_borderEnd { font-size:12pt; margin-bottom:0.0835in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-top:0in; border-top-style:none;}
- .P32 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-style:normal; }
- .P33 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-style:normal; }
- .P34 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P35 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P36 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-weight:bold; }
- .P37 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; font-weight:normal; }
- .P38 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P39 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; }
- .P4 { font-size:16pt; font-family:Helvetica; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; font-weight:bold; }
- .P40_borderStart { font-size:14pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; background-color:transparent; padding-bottom:0.0835in; border-bottom-style:none; }
- .P40 { font-size:14pt; font-family:Times New Roman; writing-mode:lr-tb; background-color:transparent; padding-bottom:0.0835in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P40_borderEnd { font-size:14pt; margin-bottom:0.0835in; font-family:Times New Roman; writing-mode:lr-tb; background-color:transparent; padding-top:0in; border-top-style:none;}
- .P41_borderStart { font-size:14pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffffff; padding-bottom:0.0835in; border-bottom-style:none; }
- .P41 { font-size:14pt; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffffff; padding-bottom:0.0835in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P41_borderEnd { font-size:14pt; margin-bottom:0.0835in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffffff; padding-top:0in; border-top-style:none;}
- .P42 { font-size:11pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P43 { font-size:9pt; margin-bottom:0.0835in; margin-top:0in; font-family:Courier; writing-mode:lr-tb; color:#000000; }
- .P44 { font-size:9pt; font-family:Courier; writing-mode:lr-tb; margin-left:0in; margin-right:0in; text-align:left ! important; text-indent:0in; color:#000000; }
- .P45 { font-size:12pt; margin-left:0.1965in; margin-right:0in; text-indent:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P46 { font-size:12pt; font-weight:bold; margin-left:0in; margin-right:0in; text-indent:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P47 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:right ! important; background-color:transparent; }
- .P48_borderStart { border-left-style:none; border-right-style:none; border-top-style:none; font-size:22pt; font-style:italic; font-weight:bold; margin-top:0.1665in; padding:0in; font-family:Helvetica; writing-mode:lr-tb; padding-bottom:0.0835in; border-bottom-style:none; }
- .P48 { border-left-style:none; border-right-style:none; font-size:22pt; font-style:italic; font-weight:bold; padding:0in; font-family:Helvetica; writing-mode:lr-tb; padding-bottom:0.0835in; padding-top:0.1665in; border-top-style:none; border-bottom-style:none; }
- .P48_borderEnd { border-bottom-width:0.0879cm; border-bottom-style:solid; border-bottom-color:#000000; border-left-style:none; border-right-style:none; font-size:22pt; font-style:italic; font-weight:bold; margin-bottom:0.0835in; padding:0in; font-family:Helvetica; writing-mode:lr-tb; padding-top:0.1665in; border-top-style:none;}
- .P49 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P5 { font-size:13pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; }
- .P50 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P51 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P52 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P53 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P54 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P55 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P56 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P57_borderStart { font-size:12pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-bottom:0.0835in; border-bottom-style:none; }
- .P57 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-bottom:0.0835in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P57_borderEnd { font-size:12pt; margin-bottom:0.0835in; font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00; padding-top:0in; border-top-style:none;}
- .P58 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P59 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; }
- .P6_borderStart { font-size:13pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; font-weight:normal; padding-bottom:0.0835in; border-bottom-style:none; }
- .P6 { font-size:13pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; font-weight:normal; padding-bottom:0.0835in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P6_borderEnd { font-size:13pt; margin-bottom:0.0835in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; font-weight:normal; padding-top:0in; border-top-style:none;}
- .P60 { font-size:11pt; margin-bottom:0.0835in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; }
- .P61 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Courier New; writing-mode:lr-tb; margin-left:1in; margin-right:0in; text-indent:0in; }
- .P62 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.5in; margin-right:0in; text-indent:0in; }
- .P63 { font-size:18pt; font-style:italic; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; }
- .P64 { font-size:18pt; font-style:italic; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; }
- .P65 { font-size:18pt; font-style:italic; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica; writing-mode:lr-tb; }
- .P7_borderStart { font-size:36pt; margin-top:0in; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:transparent; font-weight:bold; padding-bottom:0in; border-bottom-style:none; }
- .P7 { font-size:36pt; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:transparent; font-weight:bold; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P7_borderEnd { font-size:36pt; margin-bottom:0in; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:transparent; font-weight:bold; padding-top:0in; border-top-style:none;}
- .P8_borderStart { font-size:36pt; margin-top:0in; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:#ffff00; font-weight:bold; padding-bottom:0in; border-bottom-style:none; }
- .P8 { font-size:36pt; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:#ffff00; font-weight:bold; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P8_borderEnd { font-size:36pt; margin-bottom:0in; font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right ! important; background-color:#ffff00; font-weight:bold; padding-top:0in; border-top-style:none;}
- .P9_borderStart { font-size:12pt; margin-top:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-bottom:0in; border-bottom-style:none; }
- .P9 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-bottom:0in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P9_borderEnd { font-size:12pt; margin-bottom:0in; font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important; background-color:transparent; padding-top:0in; border-top-style:none;}
- .Preformatted_20_Text { font-size:10pt; font-family:Cumberland; writing-mode:lr-tb; margin-top:0in; margin-bottom:0in; }
- .Text_20_body { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb; margin-top:0in; margin-bottom:0.0835in; }
- .Sect1 { background-color:transparent; }
- .Table2 { width:7.5in; float:none; }
- .Table2_A1 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-style:none; border-top-width:0.0133cm; border-top-style:solid; border-top-color:#000000; border-bottom-style:none; }
- .Table2_A2 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-style:none; border-top-style:none; border-bottom-style:none; }
- .Table2_A4 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-style:none; border-top-style:none; border-bottom-width:0.0133cm; border-bottom-style:solid; border-bottom-color:#000000; }
- .Table2_B1 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-width:0.0133cm; border-right-style:solid; border-right-color:#000000; border-top-width:0.0133cm; border-top-style:solid; border-top-color:#000000; border-bottom-style:none; }
- .Table2_B2 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-width:0.0133cm; border-right-style:solid; border-right-color:#000000; border-top-style:none; border-bottom-style:none; }
- .Table2_B4 { padding:0.0382in; border-left-width:0.0133cm; border-left-style:solid; border-left-color:#000000; border-right-width:0.0133cm; border-right-style:solid; border-right-color:#000000; border-top-style:none; border-bottom-width:0.0133cm; border-bottom-style:solid; border-bottom-color:#000000; }
- .Table2_A { width:1.7306in; }
- .Table2_B { width:5.7694in; }
- .Bullet_20_Symbols { font-family:StarSymbol; font-size:9pt; }
- .T1 { font-weight:bold; }
- .T10 { font-family:Courier New; font-size:11pt; }
- .T11 { font-family:Courier New; font-size:11pt; font-style:italic; font-weight:bold; }
- .T12 { font-family:Courier New; font-size:11pt; font-style:normal; font-weight:normal; }
- .T13 { font-style:italic; }
- .T14 { font-style:italic; font-weight:bold; }
- .T15 { font-style:italic; }
- .T16 { font-family:Courier New; font-size:12pt; font-style:normal; }
- .T17 { font-family:Courier New; font-style:italic; font-weight:bold; }
- .T18 { font-family:Times New Roman; }
- .T19 { font-family:Times New Roman; font-size:12pt; font-style:normal; }
- .T2 { font-weight:bold; }
- .T20 { font-family:Times New Roman; font-size:12pt; font-style:normal; font-weight:bold; }
- .T21 { font-family:Times New Roman; font-size:12pt; font-style:normal; font-weight:normal; }
- .T22 { font-family:Times New Roman; font-size:12pt; font-style:italic; }
- .T23 { font-family:Times New Roman; font-size:13pt; }
- .T24 { font-family:Courier New, monospace; font-size:12pt; font-style:normal; }
- .T25 { font-family:Courier New; font-size:14pt; background-color:#ffffff; }
- .T26 { font-size:14pt; background-color:#ffffff; }
- .T27 { font-family:Courier New; }
- .T28 { font-size:12pt; font-style:normal; }
- .T29 { font-size:12pt; }
- .T3 { font-weight:bold; }
- .T30 { font-style:normal; }
- .T31 { font-weight:normal; }
- .T32 { font-size:13pt; }
- .T33 { font-size:14pt; }
- .T34 { font-size:11pt; }
- .T35 { font-size:11pt; font-weight:bold; }
- .T36 { color:#000000; font-family:Times New Roman; letter-spacing:normal; font-style:normal; font-weight:bold; }
- .T37 { font-family:Courier; }
- .T38 { color:#ff0000; }
- .T4 { font-family:Courier New; }
- .T5 { font-family:Courier New; font-size:12pt; font-style:normal; }
- .T6 { font-family:Courier New; font-size:12pt; }
- .T7 { font-family:Courier New; font-weight:bold; }
- .T8 { font-family:Courier New; font-size:10pt; }
- .T9 { font-family:Courier New; font-size:10pt; font-weight:bold; }
- .Teletype { font-family:Cumberland, monospace; }
- <!-- ODF styles with no properties representable as CSS -->
- .Sect2 .Endnote_20_Symbol .Footnote_20_Symbol { }
[... 2274 lines stripped ...]
Modified: roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/roller-install-guide.odt?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
Binary files - no diff available.
Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/
------------------------------------------------------------------------------
Merged /roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui:r1103970-1343069
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java Sun Jun 24 14:12:52 2012
@@ -55,8 +55,7 @@ public class RollerSession
public static final String ROLLER_SESSION = "org.apache.roller.weblogger.rollersession";
public static final String ERROR_MESSAGE = "rollererror_message";
public static final String STATUS_MESSAGE = "rollerstatus_message";
-
-
+
/**
* Get RollerSession from request (and add user if not already present).
*/
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Sun Jun 24 14:12:52 2012
@@ -29,7 +29,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.ui.rendering.util.*;
import org.apache.roller.weblogger.util.RollerMessages;
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java Sun Jun 24 14:12:52 2012
@@ -24,12 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.planet.business.Planet;
-import org.apache.roller.planet.business.PlanetFactory;
-import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.weblogger.ui.rendering.util.PlanetRequest;
import org.apache.roller.weblogger.util.cache.Cache;
import org.apache.roller.weblogger.util.cache.CacheManager;
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Sun Jun 24 14:12:52 2012
@@ -22,6 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -183,5 +184,5 @@ public class BookmarkAdd extends UIActio
public void setBean(BookmarkBean bean) {
this.bean = bean;
}
-
+
}
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -34,6 +35,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.core.util.menu.Menu;
import org.apache.roller.weblogger.ui.core.util.menu.MenuHelper;
+import org.apache.struts2.interceptor.RequestAware;
/**
@@ -45,8 +47,8 @@ import org.apache.roller.weblogger.ui.co
* which point to a success in a resource bundle, so we automatically call
* getText(key) on the param passed into setError() and setSuccess().
*/
-public abstract class UIAction extends ActionSupport
- implements UIActionPreparable, UISecurityEnforced {
+public abstract class UIAction extends ActionSupport
+ implements UIActionPreparable, UISecurityEnforced, RequestAware {
// a result that sends the user to an access denied warning
public static final String DENIED = "access-denied";
@@ -71,12 +73,20 @@ public abstract class UIAction extends A
// page title
protected String pageTitle = null;
-
+
+ protected String salt = null;
public void myPrepare() {
// no-op
}
-
+
+ public void setRequest(Map<String, Object> map) {
+ this.salt = (String) map.get("salt");
+ }
+
+ public String getSalt() {
+ return salt;
+ }
// default action permissions, user is required
public boolean isUserRequired() {
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp Sun Jun 24 14:12:52 2012
@@ -37,6 +37,7 @@
<tr>
<td colspan="2">
<s:form action="cacheInfo!clear">
+ <s:hidden name="salt" />
<s:hidden name="cache" value="%{#cache.key}" />
<s:submit value="%{getText('cacheInfo.clear')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp Sun Jun 24 14:12:52 2012
@@ -22,6 +22,7 @@
</p>
<s:form action="commonPingTargetAdd!save" >
+ <s:hidden name="salt" />
<div class="formrow">
<label for="name" class="formrow"><s:text name="pingTarget.name" /></label>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp Sun Jun 24 14:12:52 2012
@@ -33,11 +33,13 @@
<div class="control">
<s:form action="commonPingTargets!delete">
+ <s:hidden name="salt" />
<s:hidden name="pingTargetId" />
<s:submit value="%{getText('pingTarget.removeOK')}" />
</s:form>
<s:form action="commonPingTargets">
+ <s:hidden name="salt" />
<s:submit value="%{getText('pingTarget.cancel')}" />
</s:form>
</div>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp Sun Jun 24 14:12:52 2012
@@ -22,6 +22,7 @@
</p>
<s:form action="commonPingTargetEdit!save" >
+ <s:hidden name="salt" />
<s:hidden name="bean.id" />
<div class="formrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp Sun Jun 24 14:12:52 2012
@@ -20,6 +20,7 @@
<p class="subtitle"><s:text name="userAdmin.subtitle.createNewUser" /></p>
<s:form action="createUser!save">
+ <s:hidden name="salt" />
<table class="formtable">
<tr>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp Sun Jun 24 14:12:52 2012
@@ -90,6 +90,8 @@ function handleCommentResponse() {
<%-- ============================================================= --%>
<s:form action="globalCommentManagement!update">
+ <s:hidden name="salt" />
+
<s:hidden name="bean.ids" />
<s:hidden name="bean.offset" />
<s:hidden name="bean.count" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp Sun Jun 24 14:12:52 2012
@@ -29,6 +29,7 @@
<p><s:text name="commentManagement.sidebarDescription" /></p>
<s:form action="globalCommentManagement!query" id="comments">
+ <s:hidden name="salt" />
<div class="sideformrow">
<label for="searchString" class="sideformrow"><s:text name="commentManagement.searchString" />:</label>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp Sun Jun 24 14:12:52 2012
@@ -21,6 +21,7 @@
<p><s:text name="configForm.prompt" /></p>
<s:form action="globalConfig!save">
+ <s:hidden name="salt" />
<table class="formtableNoDesc">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="modifyUser!save">
+ <s:hidden name="salt" />
<s:hidden name="bean.id" />
<table class="formtable">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetConfig.jsp Sun Jun 24 14:12:52 2012
@@ -23,6 +23,7 @@
<p><s:text name="planetConfig.prompt" /></a>
<s:form action="planetConfig!save">
+ <s:hidden name="salt" />
<table class="formtableNoDesc">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp Sun Jun 24 14:12:52 2012
@@ -29,6 +29,7 @@
</p>
<s:form action="planetGroups!save">
+ <s:hidden name="salt" />
<s:hidden name="bean.id" />
<div class="formrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Sun Jun 24 14:12:52 2012
@@ -41,6 +41,7 @@ function confirmSubDelete(subUrl) {
<s:form action="planetSubscriptions!save">
+ <s:hidden name="salt" />
<s:hidden name="groupHandle" />
<div class="formrow">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp Sun Jun 24 14:12:52 2012
@@ -27,7 +27,8 @@
<p><s:text name="userAdmin.prompt.searchUser" /></p>
<s:form action="modifyUser" method="GET">
-
+ <s:hidden name="salt" />
+
<span style="margin:4px"><s:text name="inviteMember.userName" /></span>
<input name="userName" id="userName" size="30" maxlength="30"
onfocus="onUserNameFocus(null)" onkeyup="onUserNameChange(null)"
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp Sun Jun 24 14:12:52 2012
@@ -54,6 +54,7 @@
<p><s:text name="installer.createTables" /></p>
<s:form action="install!create">
+ <s:hidden name="salt" />
<s:submit value="%{getText('installer.yesCreateTables')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Sun Jun 24 14:12:52 2012
@@ -42,6 +42,7 @@ function handlePreview(handle) {
<br />
<s:form action="createWeblog!save">
+<s:hidden name="salt" />
<table class="formtable">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Sun Jun 24 14:12:52 2012
@@ -20,6 +20,7 @@
<p class="subtitle"><s:text name="yourProfile.description" /></p>
<s:form action="profile!save">
+ <s:hidden name="salt" />
<table class="formtable">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Register.jsp Sun Jun 24 14:12:52 2012
@@ -20,6 +20,7 @@
<p><s:text name="userRegister.prompt" /></p>
<s:form action="register!save" >
+ <s:hidden name="salt" />
<s:hidden name="bean.id" />
<s:hidden name="bean.enabled" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Setup.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Setup.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/Setup.jsp Sun Jun 24 14:12:52 2012
@@ -65,6 +65,8 @@
<s:if test="blogCount > 0">
<s:form action="setup!save">
+ <s:hidden name="salt" />
+
<table style="margin-left:2em;width:70%">
<tr>
<td class="label">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp Sun Jun 24 14:12:52 2012
@@ -39,6 +39,7 @@
<p><s:text name="installer.upgradeTables" /></p>
<s:form action="install!upgrade">
+ <s:hidden name="salt" />
<s:submit value="%{getText('installer.yesUpgradeTables')}" />
</s:form>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="bookmarkAdd!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="folderId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Sun Jun 24 14:12:52 2012
@@ -24,6 +24,7 @@
</p>
<s:form action="bookmarkEdit!save">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Jun 24 14:12:52 2012
@@ -67,6 +67,7 @@ function onMove()
<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
<s:form action="bookmarks!delete">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="folderId" />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp Sun Jun 24 14:12:52 2012
@@ -28,6 +28,7 @@
</p>
<s:form action="bookmarksImport!save" method="POST" enctype="multipart/form-data">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:file name="opmlFile" />
<br />
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1353270&r1=1353269&r2=1353270&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Sun Jun 24 14:12:52 2012
@@ -59,6 +59,7 @@ function onMove()
<%-- Form is a table of categories each with checkbox --%>
<s:form action="categories!move">
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="categoryId" />