You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/05/17 00:56:39 UTC
svn commit: r407098 [2/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...
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderEditAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderEditAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderEditAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderEditAction.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;
@@ -30,9 +30,9 @@
import org.apache.roller.model.BookmarkManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.FolderData;
-import org.apache.roller.presentation.BasePageModel;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.bookmarks.formbeans.FolderFormEx;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx;
/**
* @struts.action path="/editor/folderEdit" name="folderFormEx" validate="false"
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderSaveAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderSaveAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/FolderSaveAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/FolderSaveAction.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.FolderData;
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.bookmarks.formbeans.FolderFormEx;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx;
import org.apache.roller.util.cache.CacheManager;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportBookmarksFormAction.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.bookmarks.actions;
+package org.apache.roller.ui.authoring.struts.actions;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -34,8 +34,8 @@
import org.apache.struts.upload.FormFile;
import org.apache.roller.model.BookmarkManager;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.bookmarks.formbeans.FolderFormEx;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.authoring.struts.formbeans.FolderFormEx;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -45,8 +45,8 @@
import org.apache.roller.model.Roller;
import org.apache.roller.pojos.FolderData;
import org.apache.roller.pojos.WebsiteData;
-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.cache.CacheManager;
/////////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ImportEntriesAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ImportEntriesAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ImportEntriesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Mar 31, 2004
*/
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
import java.io.File;
import java.io.IOException;
@@ -38,10 +38,10 @@
import org.apache.roller.RollerException;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WebsiteData;
-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.ImportEntriesForm;
+import org.apache.roller.ui.authoring.struts.formbeans.ImportEntriesForm;
import org.apache.roller.util.StringUtils;
/**
* TODO: revisit this class once Atom 1.0 support comes to Rome
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/InviteMemberAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/InviteMemberAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.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.io.IOException;
import java.net.MalformedURLException;
@@ -49,11 +49,11 @@
import org.apache.roller.pojos.PermissionsData;
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.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.website.formbeans.InviteMemberForm;
+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.ui.authoring.struts.formbeans.InviteMemberForm;
import org.apache.roller.util.MailUtil;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MaintenanceAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MaintenanceAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MaintenanceAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MaintenanceAction.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package org.apache.roller.presentation.website.actions;
+package org.apache.roller.ui.authoring.struts.actions;
import java.io.IOException;
@@ -41,9 +41,9 @@
import org.apache.roller.model.IndexManager;
import org.apache.roller.model.RollerFactory;
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.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/authoring/struts/actions/MemberPermissionsAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MemberPermissionsAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MemberPermissionsAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/MemberPermissionsAction.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.ArrayList;
import java.util.Iterator;
@@ -41,10 +41,10 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
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.website.formbeans.MemberPermissionsForm;
+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.MemberPermissionsForm;
/**
* Allows website admin to change website member permissions.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/PingSetupAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/PingSetupAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.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.io.IOException;
import java.net.SocketException;
@@ -48,11 +48,11 @@
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
-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.presentation.pings.WeblogUpdatePinger;
+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.ui.core.pings.WeblogUpdatePinger;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ReferersAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ReferersAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ReferersAction.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.List;
@@ -38,9 +38,9 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.RefererData;
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.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/authoring/struts/actions/ThemeEditorAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/ThemeEditorAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/ThemeEditorAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.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.io.IOException;
import java.util.List;
@@ -41,9 +41,9 @@
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.Theme;
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.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/authoring/struts/actions/ToggleLinkbackDisplayAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.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 javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -31,9 +31,9 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.RefererData;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+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;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UploadFileFormAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UploadFileFormAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UploadFileFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.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.authoring.struts.actions;
import java.io.File;
import java.io.InputStream;
@@ -48,11 +48,11 @@
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WebsiteData;
-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.presentation.website.formbeans.UploadFileForm;
+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.ui.authoring.struts.formbeans.UploadFileForm;
import org.apache.roller.util.RollerMessages;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserBaseAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserBaseAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserBaseAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserBaseAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserBaseAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserBaseAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserBaseAction.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.authoring.struts.actions;
import org.apache.commons.lang.CharSetUtils;
import org.apache.commons.logging.Log;
@@ -26,7 +26,7 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.presentation.website.formbeans.UserFormEx;
+import org.apache.roller.ui.authoring.struts.formbeans.UserFormEx;
/////////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserNewAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserNewAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserNewAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserNewAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserNewAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UserNewAction.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.authoring.struts.actions;
import java.io.IOException;
import java.util.HashMap;
@@ -42,10 +42,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.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.website.formbeans.UserFormEx;
+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.authoring.struts.formbeans.UserFormEx;
import org.apache.roller.util.StringUtils;
/////////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.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.io.BufferedReader;
import java.io.IOException;
@@ -73,11 +73,11 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+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.weblog.formbeans.WeblogEntryFormEx;
+import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx;
import org.apache.roller.util.MailUtil;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryManagementAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryManagementAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryManagementAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryManagementAction.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.io.IOException;
import java.text.DateFormat;
@@ -38,10 +38,10 @@
import org.apache.roller.pojos.WeblogCategoryData;
import org.apache.roller.pojos.WeblogEntryData;
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.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.authoring.struts.formbeans.WeblogEntryManagementForm;
import org.apache.roller.util.DateUtil;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
/* Created on Mar 10, 2004 */
-package org.apache.roller.presentation.weblog.actions;
+package org.apache.roller.ui.authoring.struts.actions;
import java.util.ArrayList;
import java.util.Iterator;
@@ -34,14 +34,14 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.UserData;
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.presentation.tags.calendar.CalendarModel;
-import org.apache.roller.presentation.weblog.actions.WeblogEntryPageModel.PageMode;
-import org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx;
-import org.apache.roller.presentation.weblog.tags.EditWeblogCalendarModel;
+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.ui.core.tags.calendar.CalendarModel;
+import org.apache.roller.ui.authoring.struts.actions.WeblogEntryPageModel.PageMode;
+import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx;
+import org.apache.roller.ui.authoring.tags.EditWeblogCalendarModel;
import org.apache.roller.util.StringUtils;
//import com.swabunga.spell.event.SpellCheckEvent;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WeblogTemplateFormAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WeblogTemplateFormAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.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.authoring.struts.actions;
import java.io.IOException;
import java.util.Date;
@@ -45,11 +45,11 @@
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.UserData;
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.ui.core.BasePageModel;
+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.forms.WeblogTemplateForm;
+import org.apache.roller.ui.authoring.struts.forms.WeblogTemplateForm;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
/////////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.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.authoring.struts.actions;
import java.io.IOException;
import java.util.ArrayList;
@@ -54,12 +54,12 @@
import org.apache.roller.model.WeblogManager;
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.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.website.formbeans.WebsiteFormEx;
+import org.apache.roller.ui.authoring.struts.formbeans.WebsiteFormEx;
import org.apache.roller.util.Blacklist;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourProfileAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourProfileAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourProfileAction.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.io.IOException;
@@ -35,9 +35,9 @@
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.RollerSession;
-import org.apache.roller.presentation.website.formbeans.UserFormEx;
+import org.apache.roller.ui.core.BasePageModel;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.formbeans.UserFormEx;
import org.apache.roller.util.StringUtils;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourWebsitesAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourWebsitesAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/YourWebsitesAction.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.ArrayList;
import java.util.List;
@@ -39,10 +39,10 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
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.website.formbeans.YourWebsitesForm;
+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.YourWebsitesForm;
/**
* Allows user to view and pick from list of his/her websites.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BakeWeblogForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/BakeWeblogForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BakeWeblogForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BakeWeblogForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/BakeWeblogForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/BakeWeblogForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BakeWeblogForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarkFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarkFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarkFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarkFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarkFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarkFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarkFormEx.java Tue May 16 15:54:47 2006
@@ -18,11 +18,11 @@
/*
* Created on Apr 8, 2003
*/
-package org.apache.roller.presentation.bookmarks.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.presentation.forms.BookmarkForm;
+import org.apache.roller.ui.authoring.struts.forms.BookmarkForm;
/**
* Extends the BookmarkForm so that additional properties may be added.
@@ -67,7 +67,7 @@
}
/**
- * @see org.apache.roller.presentation.forms.BookmarkForm#setData(org.apache.roller.pojos.BookmarkData)
+ * @see org.apache.roller.ui.authoring.struts.forms.BookmarkForm#setData(org.apache.roller.pojos.BookmarkData)
*/
public void copyFrom(BookmarkData dataHolder, java.util.Locale locale) throws RollerException
{
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarksForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarksForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarksForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarksForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarksForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/BookmarksForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/BookmarksForm.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Oct 21, 2003
*/
-package org.apache.roller.presentation.bookmarks.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoriesForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoriesForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoriesForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoriesForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoriesForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoriesForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoriesForm.java Tue May 16 15:54:47 2006
@@ -16,11 +16,11 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.presentation.forms.WeblogCategoryForm;
+import org.apache.roller.ui.authoring.struts.forms.WeblogCategoryForm;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoryDeleteForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoryDeleteForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoryDeleteForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoryDeleteForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoryDeleteForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CategoryDeleteForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CategoryDeleteForm.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Jan 19, 2004
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.util.List;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentFormEx.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.util.Locale;
@@ -25,7 +25,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.CommentData;
-import org.apache.roller.presentation.forms.CommentForm;
+import org.apache.roller.ui.authoring.struts.forms.CommentForm;
/**
* Extends the WeblogEntryForm so that additional properties may be added.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentManagementForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentManagementForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentManagementForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentManagementForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentManagementForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentManagementForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentManagementForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.text.DateFormat;
import java.text.ParseException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentQueryForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentQueryForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentQueryForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentQueryForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentQueryForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/CommentQueryForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CommentQueryForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
/**
* @struts.form name="commentQueryForm"
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CreateWebsiteForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/CreateWebsiteForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CreateWebsiteForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CreateWebsiteForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/CreateWebsiteForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/CreateWebsiteForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/CreateWebsiteForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.util.Locale;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/FolderFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/FolderFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/FolderFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/FolderFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/FolderFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/bookmarks/formbeans/FolderFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/FolderFormEx.java Tue May 16 15:54:47 2006
@@ -16,12 +16,12 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.bookmarks.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.upload.FormFile;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.FolderData;
-import org.apache.roller.presentation.forms.FolderForm;
+import org.apache.roller.ui.authoring.struts.forms.FolderForm;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ImportEntriesForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/ImportEntriesForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ImportEntriesForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ImportEntriesForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/ImportEntriesForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/ImportEntriesForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ImportEntriesForm.java Tue May 16 15:54:47 2006
@@ -1,24 +1,24 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
/*
* Created on Apr 1, 2004
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.util.ArrayList;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/InviteMemberForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/InviteMemberForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/InviteMemberForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/InviteMemberForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/InviteMemberForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/InviteMemberForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/InviteMemberForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MaintenanceForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MaintenanceForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MaintenanceForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MaintenanceForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MaintenanceForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MaintenanceForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MaintenanceForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MemberPermissionsForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MemberPermissionsForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MemberPermissionsForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MemberPermissionsForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MemberPermissionsForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/MemberPermissionsForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/MemberPermissionsForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/PingSetupForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/PingSetupForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/PingSetupForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/PingSetupForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/PingSetupForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/PingSetupForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/PingSetupForm.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/RollerConfigFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/RollerConfigFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/RollerConfigFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/RollerConfigFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/RollerConfigFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/RollerConfigFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/RollerConfigFormEx.java Tue May 16 15:54:47 2006
@@ -16,14 +16,14 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.website.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionMapping;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.RollerConfigData;
-import org.apache.roller.presentation.forms.RollerConfigForm;
+import org.apache.roller.ui.authoring.struts.forms.RollerConfigForm;
/**
* These properties are not persistent and are only needed for the UI.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ThemeEditorForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/ThemeEditorForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ThemeEditorForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ThemeEditorForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/ThemeEditorForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/ThemeEditorForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/ThemeEditorForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/TrackbackForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/TrackbackForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/TrackbackForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/TrackbackForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/TrackbackForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/TrackbackForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/TrackbackForm.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Apr 14, 2003
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UploadFileForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UploadFileForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UploadFileForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UploadFileForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UploadFileForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UploadFileForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UploadFileForm.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.website.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.util.ArrayList;
import org.apache.commons.lang.StringUtils;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UserFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UserFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UserFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/UserFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/UserFormEx.java Tue May 16 15:54:47 2006
@@ -16,11 +16,11 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.website.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
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 org.apache.roller.util.DateUtil;
import java.sql.Timestamp;
@@ -118,7 +118,7 @@
/**
* Override to prevent password or dateCreated being copied over by form
- * @see org.apache.roller.presentation.forms.UserForm#copyTo(
+ * @see org.apache.roller.ui.authoring.struts.forms.UserForm#copyTo(
* org.apache.roller.pojos.UserData, java.util.Locale)
*/
public void copyTo(UserData dataHolder, Locale locale)
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogCategoryFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogCategoryFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogCategoryFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogCategoryFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogCategoryFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogCategoryFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogCategoryFormEx.java Tue May 16 15:54:47 2006
@@ -15,11 +15,11 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WeblogCategoryData;
-import org.apache.roller.presentation.forms.WeblogCategoryForm;
+import org.apache.roller.ui.authoring.struts.forms.WeblogCategoryForm;
/**
* Extends the WeblogCategoryForm so that additional properties may be added.
@@ -76,7 +76,7 @@
}
/**
- * @see org.apache.roller.presentation.forms.WeblogCategoryForm#copyFrom(org.apache.roller.pojos.WeblogCategoryData)
+ * @see org.apache.roller.ui.authoring.struts.forms.WeblogCategoryForm#copyFrom(org.apache.roller.pojos.WeblogCategoryData)
*/
public void copyFrom(WeblogCategoryData dataHolder, java.util.Locale locale) throws RollerException
{
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryFormEx.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.sql.Timestamp;
import java.text.DateFormat;
@@ -41,9 +41,9 @@
import org.apache.roller.pojos.EntryAttributeData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.forms.WeblogEntryForm;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.authoring.struts.forms.WeblogEntryForm;
import org.apache.roller.util.DateUtil;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryManagementForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryManagementForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryManagementForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryManagementForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryManagementForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryManagementForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryManagementForm.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Feb 3, 2006
*/
-package org.apache.roller.presentation.weblog.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.text.DateFormat;
import java.util.Calendar;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryQueryForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryQueryForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryQueryForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryQueryForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryQueryForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/formbeans/WeblogEntryQueryForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogEntryQueryForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
/**
* @struts.form name="weblogEntryQueryForm"
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/WebsiteFormEx.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Feb 14, 2004
*/
-package org.apache.roller.presentation.website.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import java.sql.Timestamp;
import java.util.Date;
@@ -28,7 +28,7 @@
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.WeblogCategoryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.forms.WebsiteForm;
+import org.apache.roller.ui.authoring.struts.forms.WebsiteForm;
import org.apache.roller.util.DateUtil;
/**
@@ -91,7 +91,7 @@
}
/**
- * @see org.apache.roller.presentation.forms.WebsiteForm#copyFrom(org.apache.roller.pojos.WebsiteData)
+ * @see org.apache.roller.ui.authoring.struts.forms.WebsiteForm#copyFrom(org.apache.roller.pojos.WebsiteData)
*/
public void copyFrom(WebsiteData dataHolder, java.util.Locale locale) throws RollerException {
super.copyFrom(dataHolder, locale);
@@ -133,7 +133,7 @@
}
/**
- * @see org.apache.roller.presentation.forms.WebsiteForm#copyTo(org.apache.roller.pojos.WebsiteData)
+ * @see org.apache.roller.ui.authoring.struts.forms.WebsiteForm#copyTo(org.apache.roller.pojos.WebsiteData)
*/
public void copyTo(WebsiteData dataHolder, java.util.Locale locale) throws RollerException {
Date dateCreated = dataHolder.getDateCreated();
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/YourWebsitesForm.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/YourWebsitesForm.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/YourWebsitesForm.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/YourWebsitesForm.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/YourWebsitesForm.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/website/formbeans/YourWebsitesForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/formbeans/YourWebsitesForm.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.formbeans;
+package org.apache.roller.ui.authoring.struts.formbeans;
import org.apache.struts.action.ActionForm;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/BigWeblogCalendarModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/BigWeblogCalendarModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/BigWeblogCalendarModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/BigWeblogCalendarModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/BigWeblogCalendarModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/BigWeblogCalendarModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/BigWeblogCalendarModel.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.tags;
+package org.apache.roller.ui.authoring.tags;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -30,8 +30,8 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.DateUtil;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/DateMacro.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/DateMacro.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/DateMacro.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/DateMacro.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.tags;
+package org.apache.roller.ui.authoring.tags;
import java.text.SimpleDateFormat;
import java.util.Date;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/EditWeblogCalendarModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/EditWeblogCalendarModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/EditWeblogCalendarModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/EditWeblogCalendarModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/EditWeblogCalendarModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/EditWeblogCalendarModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/EditWeblogCalendarModel.java Tue May 16 15:54:47 2006
@@ -16,12 +16,12 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import javax.servlet.http.HttpServletResponse;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.tags.menu.RollerMenuModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.tags.menu.RollerMenuModel;
import org.apache.roller.util.DateUtil;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/RssBadgeTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/RssBadgeTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/RssBadgeTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/RssBadgeTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import java.io.PrintWriter;
@@ -27,12 +27,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
/**
* @jsp.tag name="RssBadge"
*/
-public class RssBadgeTag extends org.apache.roller.presentation.tags.HybridTag
+public class RssBadgeTag extends org.apache.roller.ui.core.tags.HybridTag
{
static final long serialVersionUID = 8569693454388788128L;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
/* Created on April 14, 2006 */
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,7 +34,7 @@
import org.apache.roller.model.PagePluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.Utilities;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
/* Created on April 14, 2006 */
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,7 +34,7 @@
import org.apache.roller.model.PagePluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.Utilities;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
/* Created on April 14, 2006 */
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +35,7 @@
import org.apache.roller.model.PagePluginManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.Utilities;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/WeblogCalendarModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/WeblogCalendarModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/WeblogCalendarModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/WeblogCalendarModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/WeblogCalendarModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/WeblogCalendarModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/tags/WeblogCalendarModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.weblog.tags;
+package org.apache.roller.ui.authoring.tags;
import java.net.URLEncoder;
import java.text.ParsePosition;
@@ -35,8 +35,8 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.tags.calendar.CalendarModel;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.tags.calendar.CalendarModel;
import org.apache.roller.util.DateUtil;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/ArchiveParser.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/ArchiveParser.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/ArchiveParser.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/ArchiveParser.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/ArchiveParser.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/ArchiveParser.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/ArchiveParser.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Apr 2, 2004
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/Authenticator.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/Authenticator.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/Authenticator.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation;
+package org.apache.roller.ui.core;
import javax.servlet.http.HttpServletRequest;