svn commit: r407098 [1/4] - in /incubator/roller/trunk: ./ metadata/xdoclet/ src/org/apache/roller/presentation/ src/org/apache/roller/ui/ src/org/apache/roller/ui/admin/ src/org/apache/roller/ui/admin/struts/ src/org/apache/roller/ui/admin/struts/acti...

[ag...@apache.org]

Author: agilliland
Date: Tue May 16 15:54:47 2006
New Revision: 407098

URL: http://svn.apache.org/viewcvs?rev=407098&view=rev
Log:
presentation layer package reorg.

moved org.apache.roller.presentation.* into a new package structure stemming from org.apache.roller.ui.*


Added:
    incubator/roller/trunk/src/org/apache/roller/ui/
    incubator/roller/trunk/src/org/apache/roller/ui/admin/
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CacheInfoAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CommonPingTargetsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetConfigAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetGroupsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RefreshEntriesTask.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/RefreshEntriesTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/RollerPropertiesAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/SyncWebsitesTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserAdminAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/PlanetSubscriptionFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserAdminForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ajax/UserDataServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/BasePingTargetsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkEditAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarksAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoriesAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryDeleteAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryEditAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategorySaveAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CommentManagementAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CustomPingTargetsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ExportEntriesAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderEditAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderSaveAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ImportEntriesAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/InviteMemberAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MaintenanceAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MemberPermissionsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/PingSetupAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ReferersAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/ThemeEditorAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UploadFileFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserBaseAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserBaseAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserNewAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryManagementAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WeblogTemplateFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourProfileAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourWebsitesAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BakeWeblogForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/BakeWeblogForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarkFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarkFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarksForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarksForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoriesForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoriesForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoryDeleteForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoryDeleteForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentManagementForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentManagementForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentQueryForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentQueryForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CreateWebsiteForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/CreateWebsiteForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/FolderFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/FolderFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ImportEntriesForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/ImportEntriesForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/InviteMemberForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/InviteMemberForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MaintenanceForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MaintenanceForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MemberPermissionsForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MemberPermissionsForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/PingSetupForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/PingSetupForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/RollerConfigFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/RollerConfigFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ThemeEditorForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/ThemeEditorForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/TrackbackForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/TrackbackForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UploadFileForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UploadFileForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UserFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogCategoryFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogCategoryFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryManagementForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryManagementForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryQueryForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryQueryForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/YourWebsitesForm.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/YourWebsitesForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/BigWeblogCalendarModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/BigWeblogCalendarModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/DateMacro.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/EditWeblogCalendarModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/EditWeblogCalendarModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/RssBadgeTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/WeblogCalendarModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/WeblogCalendarModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/
    incubator/roller/trunk/src/org/apache/roller/ui/core/ArchiveParser.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ArchiveParser.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/Authenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/BasePageModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/BasePageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/DefaultAuthenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/InvalidRequestException.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/InvalidRequestException.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/LanguageUtil.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/LanguageUtil.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/MainPageAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/MainPageAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/ParsedRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ParsedRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/PlanetRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/PlanetRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerContext.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/RollerSession.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/RollerSession.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogFeedRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogFeedRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogPageRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogPageRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/WeblogRequest.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/WeblogRequest.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/BreadCrumbFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/CharEncodingFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/CompressionFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/DebugFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/DebugFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/IPBanFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IPBanFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/PersistenceSessionFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/PersistenceSessionFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/RequestFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/RequestFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/SchemeEnforcementFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/SchemeEnforcementFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/pings/
    incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueProcessor.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/pings/PingQueueTask.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/PingQueueTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/pings/WeblogUpdatePinger.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/DateTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/DateTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/HybridTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/HybridTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkParamTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkParamTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/LinkTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/LinkTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/RowTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/RowTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/StatusMessageTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/StatusMessageTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/VelocityTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/VelocityTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/calendar/CalendarTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/BaseRollerMenu.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/EditorNavigationBarTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/EditorNavigationBarTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/Menu.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/Menu.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuImpl.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuImpl.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItem.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItem.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuItemImpl.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuItemImpl.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/MenuTag.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/MenuTag.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/RollerMenuModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/tags/menu/RollerMenuModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/
    incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/BlacklistUpdateTask.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/BlacklistUpdateTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/tasks/TurnoverReferersTask.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/TurnoverReferersTask.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayOutputStreamWrapper.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayOutputStreamWrapper.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/ByteArrayResponseWrapper.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/ByteArrayResponseWrapper.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/CacheHttpServletResponseWrapper.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/RequestUtil.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/RequestUtil.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/ResponseContent.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/ResponseContent.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitPrintWriter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitPrintWriter.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/SplitServletOutputStream.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/SplitServletOutputStream.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/util/StrutsUtil.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/util/StrutsUtil.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/FeedCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/FeedCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedFeedCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedFeedCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfModifiedWeblogPageCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/IfPlanetModifiedFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/IfPlanetModifiedFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/MainPageCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/MainPageCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/PlanetCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/PlanetCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/RefererFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/RefererFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/filters/WeblogPageCacheFilter.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/filters/WeblogPageCacheFilter.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/newsfeeds/NewsfeedCache.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/newsfeeds/NewsfeedCache.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchAction.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchResultsPageModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchResultsPageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentAuthenticatorServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentAuthenticatorServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/ResourceServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentAuthenticator.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentAuthenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ContextLoader.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/DefaultCommentAuthenticator.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/DefaultCommentAuthenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ExportRss.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ExportRss.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FlavorServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FoafServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FoafServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/LanguageServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/LanguageServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/MathCommentAuthenticator.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/MathCommentAuthenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageHelper.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetFeedServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetFeedServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetPageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PreviewServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PreviewServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RSDServlet.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RSDServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RollerResourceLoader.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ThemeResourceLoader.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/WebappResourceLoader.java
      - copied, changed from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/WebappResourceLoader.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/export_atom.vm
      - copied unchanged from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/export_atom.vm
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/export_rss.vm
      - copied unchanged from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/export_rss.vm
Removed:
    incubator/roller/trunk/src/org/apache/roller/presentation/
Modified:
    incubator/roller/trunk/build.xml
    incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml
    incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java
    incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
    incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java
    incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
    incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
    incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
    incubator/roller/trunk/web/WEB-INF/classes/roller.properties
    incubator/roller/trunk/web/WEB-INF/velocity.properties
    incubator/roller/trunk/web/bookmarks/import.jsp
    incubator/roller/trunk/web/keepalive.jsp
    incubator/roller/trunk/web/login-redirect.jsp
    incubator/roller/trunk/web/logout-redirect.jsp
    incubator/roller/trunk/web/main.jsp
    incubator/roller/trunk/web/planet/planet.jsp
    incubator/roller/trunk/web/taglibs.jsp
    incubator/roller/trunk/web/tags/date.jsp
    incubator/roller/trunk/web/theme/searchResults.jsp
    incubator/roller/trunk/web/weblog/CommentManagement.jsp
    incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp
    incubator/roller/trunk/web/weblog/CustomPingTargets.jsp
    incubator/roller/trunk/web/weblog/PingResult.jsp
    incubator/roller/trunk/web/weblog/Pings.jsp
    incubator/roller/trunk/web/weblog/WeblogEdit.jsp
    incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp
    incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
    incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp
    incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp
    incubator/roller/trunk/web/weblog/export-entries.jsp
    incubator/roller/trunk/web/website/CommonPingTargets.jsp
    incubator/roller/trunk/web/website/edit-website.jsp

Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/build.xml?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Tue May 16 15:54:47 2006
@@ -112,7 +112,7 @@
     <ejbdoclet destdir="${build.generated}/src" excludedtags="@version,@author">
 	<fileset dir="./src" includes="org/apache/roller/pojos/WeblogTemplate.java" />
         <fileset dir="./src" includes="org/apache/roller/pojos/*Data.java" />
-        <fileset dir="./src" includes="org/apache/roller/business/*Data.java" /> 
+
         &custom-gen-web;
      
         <!-- Generate Struts forms -->
@@ -122,9 +122,9 @@
 
             <!-- into the org.apache.roller.presentation.forms package -->
             <packageSubstitution packages="pojos"
-                substituteWith="presentation.forms"/>
-            <packageSubstitution packages="presentation"
-                substituteWith="presentation.forms"/>
+                substituteWith="ui.authoring.struts.forms"/>
+           <!-- <packageSubstitution packages="presentation"
+                substituteWith="ui.authoring.struts.forms"/> -->
         </strutsform>
 
         <!-- We are not actually generating data objects, but using the
@@ -139,10 +139,10 @@
     </copy>
 
     <!-- Change Struts form names from *DataForm.java to *Form.java  -->
-    <replace dir="${build.generated}/src.presentation/org/apache/roller/presentation/forms"
+    <replace dir="${build.generated}/src.presentation/org/apache/roller/ui/authoring/struts/forms"
         token="DataForm" value="Form"/>
-    <move todir="${build.generated}/src.presentation/org/apache/roller/presentation/forms">
-        <fileset dir="${build.generated}/src.presentation/org/apache/roller/presentation/forms" >
+    <move todir="${build.generated}/src.presentation/org/apache/roller/ui/authoring/struts/forms">
+        <fileset dir="${build.generated}/src.presentation/org/apache/roller/ui/authoring/struts/forms" >
             <include name="*DataForm.java"/>
             <include name="*ConfigForm.java" />
         </fileset>
@@ -200,9 +200,9 @@
             <include name="**/*FormEx.java" />
             <include name="**/*Servlet.java" />
             <include name="**/*Tag.java" />
-            <include name="org/apache/roller/presentation/**/actions/*.java" />
-            <include name="org/apache/roller/presentation/RollerContext.java" />
-            <include name="org/apache/roller/presentation/RollerSession.java" />
+            <include name="org/apache/roller/ui/**/actions/*.java" />
+            <include name="org/apache/roller/ui/core/RollerContext.java" />
+            <include name="org/apache/roller/ui/core/RollerSession.java" />
             <exclude name="**/IPBanFilter**" />
             <exclude name="**/LinkTag**" />
             <exclude name="**/LinkParamTag**" />
@@ -289,7 +289,7 @@
     </echo>
 
     <javac debug="${build.debug}" destdir="${build.compile_beans}"
-        excludes="org/apache/roller/presentation/**, org/apache/roller/webservices/**" >
+        excludes="org/apache/roller/ui/**, org/apache/roller/webservices/**" >
         <src path="${basedir}/src" />
         <src path="${build.generated}/src.business"/>
         &custom-src-beans;
@@ -360,7 +360,7 @@
     <mkdir dir="${build.compile_web}"/>
     <antcall target="prepare.resin" />
     <javac debug="${build.debug}" destdir="${build.compile_web}"
-        includes="org/apache/roller/presentation/**, org/apache/roller/webservices/**, org/apache/roller/util/rome/**" >
+        includes="org/apache/roller/ui/**, org/apache/roller/webservices/**, org/apache/roller/util/rome/**" >
         <src path="./src"  />
         <src path="${build.generated}/src.presentation"/>
         &custom-src-web;

Modified: incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml Tue May 16 15:54:47 2006
@@ -3,7 +3,7 @@
    <tag>
       <name>link</name>
 
-      <tag-class>org.apache.roller.presentation.tags.LinkTag</tag-class>
+      <tag-class>org.apache.roller.ui.core.tags.LinkTag</tag-class>
 
       <body-content>JSP</body-content>
 
@@ -259,7 +259,7 @@
    <tag>
       <name>linkparam</name>
 
-      <tag-class>org.apache.roller.presentation.tags.LinkParamTag</tag-class>
+      <tag-class>org.apache.roller.ui.core.tags.LinkParamTag</tag-class>
 
       <body-content>JSP</body-content>
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CacheInfoAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CacheInfoAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CacheInfoAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CacheInfoAction.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
  * Created on November 11, 2005, 1:12 PM
  */
 
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.util.Map;
@@ -34,9 +34,9 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.util.cache.CacheManager;
 
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CommonPingTargetsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CommonPingTargetsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/CommonPingTargetsAction.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.util.List;
 import javax.servlet.ServletException;
@@ -30,10 +30,10 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.PingTargetData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.forms.PingTargetForm;
-import org.apache.roller.presentation.weblog.actions.BasePingTargetsAction;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.forms.PingTargetForm;
+import org.apache.roller.ui.authoring.struts.actions.BasePingTargetsAction;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetAction.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +36,7 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.PlanetConfigData;
 import org.apache.roller.pojos.PlanetGroupData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
 
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetConfigAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetConfigAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetConfigAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java Tue May 16 15:54:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,10 +38,10 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.PlanetConfigData;
 import org.apache.roller.pojos.PlanetGroupData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.forms.PlanetConfigForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.forms.PlanetConfigForm;
 
 /////////////////////////////////////////////////////////////////////////////
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetGroupsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetGroupsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetGroupsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetGroupsAction.java Tue May 16 15:54:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,10 +39,10 @@
 import org.apache.roller.model.Roller;
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.PlanetGroupData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.forms.PlanetGroupForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.forms.PlanetGroupForm;
 
 
 /////////////////////////////////////////////////////////////////////////////

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/PlanetSubscriptionsAction.java Tue May 16 15:54:47 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -27,6 +27,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.admin.struts.formbeans.PlanetSubscriptionFormEx;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
@@ -42,8 +43,8 @@
 import org.apache.roller.pojos.PlanetConfigData;
 import org.apache.roller.pojos.PlanetGroupData;
 import org.apache.roller.pojos.PlanetSubscriptionData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.util.Technorati;
 
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RefreshEntriesTask.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/RefreshEntriesTask.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RefreshEntriesTask.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RefreshEntriesTask.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/RefreshEntriesTask.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/RefreshEntriesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RefreshEntriesTask.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.util.TimerTask;
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/RollerPropertiesAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/RollerPropertiesAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/RollerPropertiesAction.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
  * Created on April 21, 2005, 2:48 PM
  */
 
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -47,9 +47,9 @@
 import org.apache.roller.model.Roller;
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.RollerPropertyData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 
 
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/SyncWebsitesTask.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/SyncWebsitesTask.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/SyncWebsitesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.util.ArrayList;

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserAdminAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserAdminAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/actions/UserAdminAction.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.admin.struts.actions;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -29,6 +29,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.authoring.struts.actions.UserBaseAction;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
@@ -42,10 +43,10 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.model.UserManager;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.website.formbeans.UserAdminForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.admin.struts.formbeans.UserAdminForm;
 import org.apache.roller.util.StringUtils;
 
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/PlanetSubscriptionFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/PlanetSubscriptionFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/PlanetSubscriptionFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/planet/PlanetSubscriptionFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/PlanetSubscriptionFormEx.java Tue May 16 15:54:47 2006
@@ -15,9 +15,9 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.planet;
+package org.apache.roller.ui.admin.struts.formbeans;
 
-import org.apache.roller.presentation.forms.PlanetSubscriptionForm;
+import org.apache.roller.ui.authoring.struts.forms.PlanetSubscriptionForm;
 
 /**
  * @struts.form name="planetSubscriptionFormEx"

Copied: incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserAdminForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserAdminForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserAdminForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/admin/struts/formbeans/UserAdminForm.java Tue May 16 15:54:47 2006
@@ -16,14 +16,15 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.presentation.website.formbeans;
+package org.apache.roller.ui.admin.struts.formbeans;
 
 import java.util.Locale;
+import org.apache.roller.ui.authoring.struts.formbeans.UserFormEx;
 
 import org.apache.struts.action.ActionMapping;
 import org.apache.roller.RollerException;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.presentation.forms.UserForm;
+import org.apache.roller.ui.authoring.struts.forms.UserForm;
 
 import javax.servlet.http.HttpServletRequest;
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ajax/UserDataServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/ajax/UserDataServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/ajax/UserDataServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/ajax/UserDataServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.ajax;
+package org.apache.roller.ui.authoring.ajax;
 
 import java.io.IOException;
 import java.util.Iterator;

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/BasePingTargetsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/BasePingTargetsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java Tue May 16 15:54:47 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.List;
 
@@ -34,9 +34,9 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.PingTargetData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.forms.PingTargetForm;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.authoring.struts.forms.PingTargetForm;
+import org.apache.roller.ui.core.RollerRequest;
 
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkEditAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkEditAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkEditAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.bookmarks.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.LinkedList;
 
@@ -34,10 +34,10 @@
 import org.apache.roller.pojos.BookmarkData;
 import org.apache.roller.pojos.FolderData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.bookmarks.formbeans.BookmarkFormEx;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.BookmarkFormEx;
 
 /**
  * @struts.action path="/editor/bookmarkEdit" name="bookmarkFormEx" validate="false"

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkSaveAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkSaveAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarkSaveAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkSaveAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.bookmarks.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -34,9 +34,9 @@
 import org.apache.roller.pojos.BookmarkData;
 import org.apache.roller.pojos.FolderData;
 import org.apache.roller.pojos.PermissionsData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.bookmarks.formbeans.BookmarkFormEx;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.BookmarkFormEx;
 import org.apache.roller.util.cache.CacheManager;
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarksAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarksAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarksAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.bookmarks.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.text.MessageFormat;
 import java.util.Comparator;
@@ -48,10 +48,10 @@
 import org.apache.roller.pojos.BookmarkData;
 import org.apache.roller.pojos.FolderData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.bookmarks.formbeans.BookmarksForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.BookmarksForm;
 import org.apache.roller.util.cache.CacheManager;
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoriesAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoriesAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoriesAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.text.MessageFormat;
 import java.util.Comparator;
@@ -47,10 +47,10 @@
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.weblog.formbeans.CategoriesForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.CategoriesForm;
 
 /**
  * Actions that are initiated from the CategoriesForm.

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryDeleteAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryDeleteAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryDeleteAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -35,10 +35,10 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.weblog.formbeans.CategoryDeleteForm;
+import org.apache.roller.ui.authoring.struts.formbeans.CategoryDeleteForm;
 
 /**
  * @struts.action path="/editor/categoryDelete" name="categoryDeleteForm"

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryEditAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryEditAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategoryEditAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategoryEditAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.LinkedList;
 
@@ -33,10 +33,10 @@
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.weblog.formbeans.WeblogCategoryFormEx;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.WeblogCategoryFormEx;
 
 /**
  * @struts.action path="/editor/categoryEdit" name="weblogCategoryFormEx" validate="false"

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategorySaveAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategorySaveAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CategorySaveAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CategorySaveAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Oct 21, 2003
  */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,10 +33,10 @@
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.PermissionsData;
 import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.weblog.formbeans.WeblogCategoryFormEx;
+import org.apache.roller.ui.authoring.struts.formbeans.WeblogCategoryFormEx;
 
 /**
  * @struts.action path="/editor/categorySave" name="weblogCategoryFormEx"

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CommentManagementAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CommentManagementAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CommentManagementAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -43,13 +43,13 @@
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.servlets.CommentServlet;
-import org.apache.roller.presentation.weblog.formbeans.CommentManagementForm;
+import org.apache.roller.ui.rendering.servlets.CommentServlet;
+import org.apache.roller.ui.authoring.struts.formbeans.CommentManagementForm;
 import org.apache.roller.util.Utilities;
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CreateWebsiteAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CreateWebsiteAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CreateWebsiteAction.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,10 +40,10 @@
 import org.apache.roller.model.UserManager;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.website.formbeans.CreateWebsiteForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.CreateWebsiteForm;
 import org.apache.roller.util.Utilities;
 
 

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CustomPingTargetsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CustomPingTargetsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CustomPingTargetsAction.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.Collections;
 import java.util.List;
@@ -35,9 +35,9 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.pojos.PingTargetData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.forms.PingTargetForm;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.authoring.struts.forms.PingTargetForm;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
 
 
 /**

Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ExportEntriesAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ExportEntriesAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ExportEntriesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ExportEntriesAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
 /*
  * Created on Mar 25, 2004
  */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -51,11 +51,11 @@
 import org.apache.roller.model.RollerFactory;
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.velocity.ExportRss;
-import org.apache.roller.presentation.weblog.formbeans.WeblogEntryManagementForm;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.rendering.velocity.ExportRss;
+import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryManagementForm;
 import org.apache.roller.util.DateUtil;
 
 /**