roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1588757 [1/25] - in /roller/branches/rome2/app/src: main/java/org/apache/roller/ main/java/org/apache/roller/planet/business/ main/java/org/apache/roller/planet/business/fetcher/ main/java/org/apache/roller/planet/business/jpa/ main/java/o...
Date Sun, 20 Apr 2014 13:39:01 GMT
Author: snoopdave
Date: Sun Apr 20 13:38:51 2014
New Revision: 1588757

URL: http://svn.apache.org/r1588757
Log:
Merged from trunk using this command:

svn merge -r 1546817:HEAD https://svn.apache.org/repos/asf/roller/trunk .

Added:
    roller/branches/rome2/app/src/main/java/org/apache/roller/util/RollerConstants.java
      - copied unchanged from r1588713, roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/CommentSearchCriteria.java
      - copied unchanged from r1588713, roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/CommentSearchCriteria.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntrySearchCriteria.java
      - copied unchanged from r1588713, roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntrySearchCriteria.java
    roller/branches/rome2/app/src/main/webapp/roller-ui/scripts/jquery-1.11.0.min.js
      - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-1.11.0.min.js
    roller/branches/rome2/app/src/main/webapp/roller-ui/scripts/jquery-ui.custom.min.js
      - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/scripts/jquery-ui.custom.min.js
Removed:
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/LeftTag.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringW.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/TrimTag.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/XmlW.java
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargets.jsp
    roller/branches/rome2/app/src/main/webapp/roller-ui/scripts/calendar.js
    roller/branches/rome2/app/src/main/webapp/roller-ui/scripts/jquery-1.4.2.min.js
    roller/branches/rome2/app/src/main/webapp/roller-ui/styles/calendar.css
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
    roller/branches/rome2/app/src/test/resources/WEB-INF/security.xml
Modified:
    roller/branches/rome2/app/src/main/java/org/apache/roller/RollerException.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Category.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/MailUtil.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/util/UUIDGenerator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/TestUtils.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PropertiesManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAOAuthManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SearchPluginBase.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateCode.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/ConfigDef.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/User.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java   (contents, props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogReferrerWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/CmaRollerContext.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/RoleAssignmentFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedMenu.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTab.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTabItem.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringTagSupport.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/TruncateNicelyTag.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/WordWrapTag.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/I18nUtils.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/IPBanList.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/Cache.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/   (props changed)
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
    roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
    roller/branches/rome2/app/src/main/resources/ApplicationResources.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_da.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_de.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_es.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_is.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_ja_JP.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_nl.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_ru.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_sl.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_vi.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_CN.properties
    roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_TW.properties
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planet.properties   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml   (contents, props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html   (props changed)
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml
    roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
    roller/branches/rome2/app/src/main/resources/sql/310-to-400-migration.vm
    roller/branches/rome2/app/src/main/resources/sql/400-to-500-migration.vm
    roller/branches/rome2/app/src/main/resources/sql/500-to-510-migration.vm
    roller/branches/rome2/app/src/main/resources/sql/createdb.vm
    roller/branches/rome2/app/src/main/resources/sql/droptables.sql
    roller/branches/rome2/app/src/main/resources/sql/macros.vm
    roller/branches/rome2/app/src/main/resources/struts.properties
    roller/branches/rome2/app/src/main/resources/struts.xml
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileHierarchicalView.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
    roller/branches/rome2/app/src/main/webapp/WEB-INF/security.xml
    roller/branches/rome2/app/src/main/webapp/WEB-INF/taglib.tld
    roller/branches/rome2/app/src/main/webapp/WEB-INF/tiles.xml
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/feeds.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/site-search-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm
    roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml
    roller/branches/rome2/app/src/main/webapp/roller-ui/login-redirect.jsp
    roller/branches/rome2/app/src/main/webapp/roller-ui/styles/roller.css
    roller/branches/rome2/app/src/main/webapp/theme/scripts/roller.js
    roller/branches/rome2/app/src/main/webapp/themes/basic/permalink-mobile.vm
    roller/branches/rome2/app/src/main/webapp/themes/basic/permalink.vm
    roller/branches/rome2/app/src/main/webapp/themes/basic/searchresults.vm
    roller/branches/rome2/app/src/main/webapp/themes/basic/sidebar.vm
    roller/branches/rome2/app/src/main/webapp/themes/basic/weblog-mobile.vm
    roller/branches/rome2/app/src/main/webapp/themes/basic/weblog.vm
    roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/permalink.vm
    roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/sidebar.vm
    roller/branches/rome2/app/src/main/webapp/themes/brushedmetal/weblog.vm
    roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/entry.vm
    roller/branches/rome2/app/src/main/webapp/themes/fauxcoly/weblog.vm
    roller/branches/rome2/app/src/main/webapp/themes/sotto/permalink.vm
    roller/branches/rome2/app/src/main/webapp/themes/sotto/sidebar.vm
    roller/branches/rome2/app/src/main/webapp/themes/sotto/weblog.vm
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/HitCountTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/   (props changed)
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
    roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/BlacklistTest.java
    roller/branches/rome2/app/src/test/resources/blacklist.txt
    roller/branches/rome2/app/src/test/resources/roller-custom.properties
    roller/branches/rome2/app/src/test/resources/roller-jettyrun.properties
    roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg   (props changed)
    roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg   (props changed)

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/RollerException.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/RollerException.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/RollerException.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/RollerException.java Sun Apr 20 13:38:51 2014
@@ -97,7 +97,7 @@ public abstract class RollerException ex
     
     
     /**
-     * Print stack trace for exception and for root cause exception if htere is one.
+     * Print stack trace for exception and for root cause exception if there is one.
      * @see java.lang.Throwable#printStackTrace()
      */
     public void printStackTrace() {
@@ -110,7 +110,7 @@ public abstract class RollerException ex
     
     
     /**
-     * Print stack trace for exception and for root cause exception if htere is one.
+     * Print stack trace for exception and for root cause exception if there is one.
      * @param s Stream to print to.
      */
     public void printStackTrace(PrintStream s) {
@@ -123,7 +123,7 @@ public abstract class RollerException ex
     
     
     /**
-     * Print stack trace for exception and for root cause exception if htere is one.
+     * Print stack trace for exception and for root cause exception if there is one.
      * @param s Writer to write to.
      */
     public void printStackTrace(PrintWriter s) {

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java Sun Apr 20 13:38:51 2014
@@ -22,7 +22,6 @@ import java.io.UnsupportedEncodingExcept
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.Map;
-import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 
 /**
@@ -108,28 +107,27 @@ public class MultiPlanetURLStrategy impl
     /**
      * Compose a map of key=value params into a query string.
      */
-    public String getQueryString(Map params) {
+    public String getQueryString(Map<String, String> params) {
         
         if(params == null) {
             return null;
         }
         
         StringBuilder queryString = new StringBuilder();
-        
-        for(Object key : params.keySet()) {
-            String value = (String) params.get(key);
-            
+
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+
             if (queryString.length() == 0) {
                 queryString.append("?");
             } else {
                 queryString.append("&");
             }
-            
-            queryString.append(key);
+
+            queryString.append(entry.getKey());
             queryString.append("=");
-            queryString.append(value);
+            queryString.append(entry.getValue());
         }
-        
+
         return queryString.toString();
     }
     

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetManager.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetManager.java Sun Apr 20 13:38:51 2014
@@ -45,7 +45,7 @@ public interface PlanetManager extends M
     Planet getWebloggerById(String id) throws RollerException;
     
     
-    List getWebloggers() throws RollerException;
+    List<Planet> getWebloggers() throws RollerException;
     
     
     /**
@@ -96,7 +96,7 @@ public interface PlanetManager extends M
     /**
      * Get all subscriptions.
      */
-    List getSubscriptions() throws RollerException;
+    List<Subscription> getSubscriptions() throws RollerException;
     
     
     /**
@@ -108,13 +108,13 @@ public interface PlanetManager extends M
     /**
      * Get top X subscriptions.
      */
-    List getTopSubscriptions(int offset, int len) throws RollerException;
+    List<Subscription> getTopSubscriptions(int offset, int len) throws RollerException;
     
     
     /**
      * Get top X subscriptions, restricted by group.
      */
-    List getTopSubscriptions(PlanetGroup group, int offset, int len)
+    List<Subscription> getTopSubscriptions(PlanetGroup group, int offset, int len)
         throws RollerException;
     
     
@@ -148,23 +148,23 @@ public interface PlanetManager extends M
     /**
      * Get entries in a single feed as list of SubscriptionEntry objects.
      */
-    List getEntries(Subscription sub, int offset, int len)
+    List<SubscriptionEntry> getEntries(Subscription sub, int offset, int len)
         throws RollerException;
     
     
     /**
-     * Get Entries for a Group in reverse chonological order.
+     * Get Entries for a Group in reverse chronological order.
      *
      * @param group Restrict to entries from one group.
      * @param offset Offset into results (for paging)
      * @param len Maximum number of results to return (for paging)
      */
-    List getEntries(PlanetGroup group, int offset, int len)
+    List<SubscriptionEntry> getEntries(PlanetGroup group, int offset, int len)
         throws RollerException;
     
     
     /**
-     * Get Entries for a Group in reverse chonological order, optionally 
+     * Get Entries for a Group in reverse chronological order, optionally
      * constrained to a certain timeframe.
      *
      * @param group Restrict to entries from one group.
@@ -173,7 +173,7 @@ public interface PlanetManager extends M
      * @param offset Offset into results (for paging)
      * @param len Maximum number of results to return (for paging)
      */
-    List getEntries(PlanetGroup group,
+    List<SubscriptionEntry> getEntries(PlanetGroup group,
                            Date startDate, 
                            Date endDate,
                            int offset, 

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java Sun Apr 20 13:38:51 2014
@@ -73,7 +73,7 @@ public interface PlanetURLStrategy {
     /**
      * Compose a map of key=value params into a query string.
      */
-    String getQueryString(Map params);
+    String getQueryString(Map<String, String> params);
     
     
     /**

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java Sun Apr 20 13:38:51 2014
@@ -37,7 +37,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.planet.pojos.SubscriptionEntry;
@@ -115,7 +116,7 @@ public class RomeFeedFetcher implements 
             try {
                 SyndFeedInfo feedInfo = feedCache.getFeedInfo(new URL(newSub.getFeedURL()));
                 if(feedInfo.getLastModified() != null) {
-                    long lastUpdatedLong = ((Long)feedInfo.getLastModified()).longValue();
+                    long lastUpdatedLong = (Long) feedInfo.getLastModified();
                     if (lastUpdatedLong != 0) {
                         newSub.setLastUpdated(new Date(lastUpdatedLong));
                     }
@@ -132,7 +133,7 @@ public class RomeFeedFetcher implements 
         }
         
         if(log.isDebugEnabled()) {
-            log.debug("Subscription is: "+newSub.toString());
+            log.debug("Subscription is: " + newSub.toString());
         }
         
         
@@ -149,7 +150,7 @@ public class RomeFeedFetcher implements 
         
         // add entries
         List<SyndEntry> feedEntries = feed.getEntries();
-        for( SyndEntry feedEntry : feedEntries ) {
+        for (SyndEntry feedEntry : feedEntries) {
             SubscriptionEntry newEntry = buildEntry(feedEntry);
             
             // some kludge to handle feeds with no entry dates
@@ -188,7 +189,8 @@ public class RomeFeedFetcher implements 
         if (romeEntry.getAuthor() != null) {
             newEntry.setAuthor(romeEntry.getAuthor());
         } else {
-            newEntry.setAuthor(entrydc.getCreator()); // use <dc:creator>
+            // use <dc:creator>
+            newEntry.setAuthor(entrydc.getCreator());
         }
         
         // Play some games to get the updated date
@@ -199,9 +201,11 @@ public class RomeFeedFetcher implements 
         
         // And more games getting publish date
         if (romeEntry.getPublishedDate() != null) {
-            newEntry.setPubTime(new Timestamp(romeEntry.getPublishedDate().getTime())); // use <pubDate>
+            // use <pubDate>
+            newEntry.setPubTime(new Timestamp(romeEntry.getPublishedDate().getTime()));
         } else if (entrydc != null && entrydc.getDate() != null) {
-            newEntry.setPubTime(new Timestamp(entrydc.getDate().getTime())); // use <dc:date>
+            // use <dc:date>
+            newEntry.setPubTime(new Timestamp(entrydc.getDate().getTime()));
         } else {
             newEntry.setPubTime(newEntry.getUpdateTime());
         }
@@ -210,22 +214,20 @@ public class RomeFeedFetcher implements 
         if (romeEntry.getContents().size() > 0) {
             SyndContent content= (SyndContent)romeEntry.getContents().get(0);
             if (content != null && content.getType().equals("text/plain")) {
-                newEntry.setText(StringEscapeUtils.unescapeHtml(content.getValue()));
+                newEntry.setText(StringEscapeUtils.unescapeHtml4(content.getValue()));
             } else if (content != null) {
                 newEntry.setText(content.getValue());
             }
         }
         
         // no content, try summary
-        if (newEntry.getText() == null || newEntry.getText().trim().length() == 0) {
-            if (romeEntry.getDescription() != null) {
-                newEntry.setText(romeEntry.getDescription().getValue());
-            }
+        if (StringUtils.isBlank(newEntry.getText()) && romeEntry.getDescription() != null)  {
+            newEntry.setText(romeEntry.getDescription().getValue());
         }
         
         // copy categories
         if (romeEntry.getCategories().size() > 0) {
-            List list = new ArrayList();
+            List<String> list = new ArrayList<String>();
             for (Object cat : romeEntry.getCategories()) {
                 list.add(((SyndCategory) cat).getName());
             }
@@ -265,7 +267,8 @@ public class RomeFeedFetcher implements 
                 cacheDir.mkdirs();
             }
         } catch (Exception e) {
-            log.error("Unable to create planet cache directory: " + cacheDir.getPath(), e);
+            log.error("Unable to create planet cache directory: " +
+                    ((cacheDir != null) ? cacheDir.getPath() : null), e);
             return null;
         }
         
@@ -284,7 +287,7 @@ public class RomeFeedFetcher implements 
         
         FeedFetcherCache feedCache = getRomeFetcherCache();
         
-        FeedFetcher feedFetcher = null;
+        FeedFetcher feedFetcher;
         if(feedCache != null) {
             feedFetcher = new HttpURLFeedFetcher(feedCache);
         } else {

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Sun Apr 20 13:38:51 2014
@@ -21,10 +21,8 @@ package org.apache.roller.planet.busines
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
 
@@ -38,6 +36,7 @@ import org.apache.roller.planet.pojos.Su
 import org.apache.roller.planet.pojos.PlanetGroup;
 import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.planet.business.AbstractManagerImpl;
+import org.apache.roller.util.RollerConstants;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
 
@@ -53,11 +52,7 @@ public class JPAPlanetManagerImpl extend
     
     /** The strategy for this manager. */
     private final JPAPersistenceStrategy strategy;
-    
-    protected Map lastUpdatedByGroup = new HashMap();
-    protected static final String NO_GROUP = "zzz_nogroup_zzz";
-    
-    
+
     @com.google.inject.Inject  
     protected JPAPlanetManagerImpl(JPAPersistenceStrategy strategy) {
         log.debug("Instantiating JPA Planet Manager");
@@ -116,7 +111,7 @@ public class JPAPlanetManagerImpl extend
     
     public Iterator getAllSubscriptions() {
         try {
-            return ((List)strategy.getNamedQuery(
+            return (strategy.getNamedQuery(
                     "Subscription.getAll").getResultList()).iterator();
         } catch (Exception e) {
             throw new RuntimeException(
@@ -129,7 +124,7 @@ public class JPAPlanetManagerImpl extend
         return q.getResultList().size();
     }
     
-    public List getTopSubscriptions(int offset, int length)
+    public List<Subscription> getTopSubscriptions(int offset, int length)
     throws RollerException {
         return getTopSubscriptions(null, offset, length);
     }
@@ -137,9 +132,9 @@ public class JPAPlanetManagerImpl extend
     /**
      * Get top X subscriptions, restricted by group.
      */
-    public List getTopSubscriptions(
+    public List<Subscription> getTopSubscriptions(
             PlanetGroup group, int offset, int len) throws RollerException {
-        List result = null;
+        List<Subscription> result;
         if (group != null) {
             Query q = strategy.getNamedQuery(
                     "Subscription.getByGroupOrderByInboundBlogsDesc");
@@ -200,11 +195,11 @@ public class JPAPlanetManagerImpl extend
         return (Planet)strategy.load(Planet.class, id);
     }
     
-    public List getWebloggers() throws RollerException {
-        return (List)strategy.getNamedQuery("Planet.getAll").getResultList();
+    public List<Planet> getWebloggers() throws RollerException {
+        return strategy.getNamedQuery("Planet.getAll").getResultList();
     }
     
-    public List getGroupHandles(Planet planet) throws RollerException {
+    public List<String> getGroupHandles(Planet planet) throws RollerException {
         List<String> handles = new ArrayList<String>();
         for (PlanetGroup group : getGroups(planet)) {
             handles.add(group.getHandle());
@@ -242,7 +237,7 @@ public class JPAPlanetManagerImpl extend
         sub.getEntries().clear();
     }
     
-    public List getSubscriptions() throws RollerException {
+    public List<Subscription> getSubscriptions() throws RollerException {
         Query q = strategy.getNamedQuery("Subscription.getAllOrderByFeedURL");
         return q.getResultList();
     }
@@ -251,7 +246,7 @@ public class JPAPlanetManagerImpl extend
         return (SubscriptionEntry) strategy.load(SubscriptionEntry.class, id);
     }
 
-    public List getEntries(Subscription sub, int offset, int len) throws RollerException {            
+    public List<SubscriptionEntry> getEntries(Subscription sub, int offset, int len) throws RollerException {
         if (sub == null) {
             throw new WebloggerException("subscription cannot be null");
         }
@@ -266,22 +261,22 @@ public class JPAPlanetManagerImpl extend
         return q.getResultList();
     }
 
-    public List getEntries(PlanetGroup group, int offset, int len) throws RollerException {
+    public List<SubscriptionEntry> getEntries(PlanetGroup group, int offset, int len) throws RollerException {
         return getEntries(group, null, null, offset, len);
     }
 
-    public List getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws RollerException {
+    public List<SubscriptionEntry> getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws RollerException {
 
         if (group == null) {
             throw new WebloggerException("group cannot be null or empty");
         }
         
-        List ret = null;
+        List<SubscriptionEntry> ret = null;
         try {
             long startTime = System.currentTimeMillis();
             
             StringBuilder sb = new StringBuilder();
-            List params = new ArrayList();
+            List<Object> params = new ArrayList<Object>();
             int size = 0;
             sb.append("SELECT e FROM SubscriptionEntry e ");
             sb.append("JOIN e.subscription.groups g ");
@@ -314,7 +309,8 @@ public class JPAPlanetManagerImpl extend
             
             long endTime = System.currentTimeMillis();
             
-            log.debug("Generated aggregation of " + ret.size() + " in " + ((endTime-startTime)/1000.0) + " seconds");
+            log.debug("Generated aggregation of " + ret.size() + " in " +
+                    ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
             
         } catch (Exception e) {
             throw new WebloggerException(e);

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java Sun Apr 20 13:38:51 2014
@@ -29,6 +29,7 @@ import org.apache.roller.planet.business
 import org.apache.roller.planet.pojos.PlanetGroup;
 import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.util.RollerConstants;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 
@@ -40,14 +41,10 @@ public class SingleThreadedFeedUpdater i
     
     private static Log log = LogFactory.getLog(SingleThreadedFeedUpdater.class);
 
-    private static final double MS_TO_SEC_DIVISOR = 1000.0;
-    
-    
     public SingleThreadedFeedUpdater() {
         // no-op
     }
-    
-    
+
     /**
      * @inheritDoc
      */
@@ -123,7 +120,7 @@ public class SingleThreadedFeedUpdater i
         
         long subEndTime = System.currentTimeMillis();
         log.debug("updated feed -- "+sub.getFeedURL()+" -- in " +
-                ((subEndTime-subStartTime) / MS_TO_SEC_DIVISOR) + " seconds.  " + entries +
+                ((subEndTime-subStartTime) / RollerConstants.SEC_IN_MS) + " seconds.  " + entries +
                 " entries updated.");
     }
     
@@ -149,7 +146,7 @@ public class SingleThreadedFeedUpdater i
         
         long endTime = System.currentTimeMillis();
         log.info("--- DONE --- Updated subscriptions in "
-                + ((endTime-startTime) / MS_TO_SEC_DIVISOR) + " seconds");
+                + ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
     }
     
     
@@ -172,7 +169,7 @@ public class SingleThreadedFeedUpdater i
         
         long endTime = System.currentTimeMillis();
         log.info("--- DONE --- Updated subscriptions in "
-                + ((endTime-startTime) / MS_TO_SEC_DIVISOR) + " seconds");
+                + ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
     }
     
     

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Category.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Category.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Category.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Category.java Sun Apr 20 13:38:51 2014
@@ -24,8 +24,6 @@ package org.apache.roller.planet.pojos;
 public class Category {
     
     private String name = null;
-    private String path = null;
-    
 
     public String getName() {
         return name;
@@ -35,12 +33,4 @@ public class Category {
         this.name = name;
     }
 
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-    
 }

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java Sun Apr 20 13:38:51 2014
@@ -25,13 +25,13 @@ import java.util.TreeSet;
 /**
  * A Roller "Planet".
  */
-public class Planet implements Comparable {
+public class Planet implements Comparable<Planet> {
     
     private String id = UUIDGenerator.generateUUID();
     private String handle = null;
     private String title = null;
     private String description = null;
-    private Set groups = new TreeSet();
+    private Set<PlanetGroup> groups = new TreeSet<PlanetGroup>();
     
     
     public Planet() {
@@ -48,8 +48,7 @@ public class Planet implements Comparabl
     /**
      * For comparing planets and sorting, ordered by Title.
      */
-    public int compareTo(Object o) {
-        Planet other = (Planet) o;
+    public int compareTo(Planet other) {
         return getTitle().compareTo(other.getTitle());
     }
     
@@ -85,11 +84,11 @@ public class Planet implements Comparabl
         this.description = description;
     }
 
-    public Set getGroups() {
+    public Set<PlanetGroup> getGroups() {
         return groups;
     }
 
-    public void setGroups(Set groups) {
+    public void setGroups(Set<PlanetGroup> groups) {
         this.groups = groups;
     }
     

Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Sun Apr 20 13:38:51 2014
@@ -30,7 +30,7 @@ import org.apache.roller.weblogger.busin
 /**
  * Planet Group.
  */
-public class PlanetGroup implements Serializable, Comparable {
+public class PlanetGroup implements Serializable, Comparable<PlanetGroup> {
 
     private transient String[] catArray = null;
     
@@ -47,7 +47,7 @@ public class PlanetGroup implements Seri
     
     // associations
     private Planet planet = null;
-    private Set subscriptions = new TreeSet();
+    private Set<Subscription> subscriptions = new TreeSet<Subscription>();
     
     
     public PlanetGroup() {}
@@ -62,8 +62,7 @@ public class PlanetGroup implements Seri
     /**
      * For comparing groups and sorting, ordered by Title.
      */
-    public int compareTo(Object o) {
-        PlanetGroup other = (PlanetGroup) o;
+    public int compareTo(PlanetGroup other) {
         return getTitle().compareTo(other.getTitle());
     }
     
@@ -132,11 +131,11 @@ public class PlanetGroup implements Seri
         this.planet = planet;
     }
     
-    public Set getSubscriptions() {
+    public Set<Subscription> getSubscriptions() {
         return subscriptions;
     }
     
-    public void setSubscriptions(Set subscriptions) {
+    public void setSubscriptions(Set<Subscription> subscriptions) {
         this.subscriptions = subscriptions;
     }
     
@@ -144,12 +143,12 @@ public class PlanetGroup implements Seri
     /**
      * Return a list of the most recent 10 entries from this group.
      */
-    public List getRecentEntries() {
+    public List<SubscriptionEntry> getRecentEntries() {
         PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
         try {
             return mgr.getEntries(this, 0, 10);
         } catch(Exception e) {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
     }
     
@@ -162,8 +161,8 @@ public class PlanetGroup implements Seri
         if (cats == null || cats.length == 0) {
             return true;
         }
-        for (int i=0; i<cats.length; i++) {
-            if (entry.inCategory(cats[i])) {
+        for (String cat : cats) {
+            if (entry.inCategory(cat)) {
                 return true;
             }
         }



Mime
View raw message