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/10/19 17:57:21 UTC
svn commit: r465668 - in /incubator/roller/trunk:
src/org/apache/roller/business/ src/org/apache/roller/model/
src/org/apache/roller/ui/authoring/struts/actions/
src/org/apache/roller/ui/rendering/servlets/
src/org/apache/roller/webservices/atomprotoco...
Author: agilliland
Date: Thu Oct 19 08:57:19 2006
New Revision: 465668
URL: http://svn.apache.org/viewvc?view=rev&rev=465668
Log:
Moving org.apache.roller.model.* classes under org.apache.roller.business.*
This commit moves the FileManager.
Added:
incubator/roller/trunk/src/org/apache/roller/business/FileIOException.java
- copied, changed from r465374, incubator/roller/trunk/src/org/apache/roller/model/FileIOException.java
incubator/roller/trunk/src/org/apache/roller/business/FileManager.java
- copied, changed from r465389, incubator/roller/trunk/src/org/apache/roller/model/FileManager.java
incubator/roller/trunk/src/org/apache/roller/business/FileNotFoundException.java
- copied, changed from r465374, incubator/roller/trunk/src/org/apache/roller/model/FileNotFoundException.java
incubator/roller/trunk/src/org/apache/roller/business/FilePathException.java
- copied, changed from r465374, incubator/roller/trunk/src/org/apache/roller/model/FilePathException.java
Removed:
incubator/roller/trunk/src/org/apache/roller/model/FileIOException.java
incubator/roller/trunk/src/org/apache/roller/model/FileManager.java
incubator/roller/trunk/src/org/apache/roller/model/FileNotFoundException.java
incubator/roller/trunk/src/org/apache/roller/model/FilePathException.java
Modified:
incubator/roller/trunk/src/org/apache/roller/business/FileManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/model/Roller.java
incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java
Copied: incubator/roller/trunk/src/org/apache/roller/business/FileIOException.java (from r465374, incubator/roller/trunk/src/org/apache/roller/model/FileIOException.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/FileIOException.java?view=diff&rev=465668&p1=incubator/roller/trunk/src/org/apache/roller/model/FileIOException.java&r1=465374&p2=incubator/roller/trunk/src/org/apache/roller/business/FileIOException.java&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/FileIOException.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/FileIOException.java Thu Oct 19 08:57:19 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import org.apache.roller.RollerException;
Copied: incubator/roller/trunk/src/org/apache/roller/business/FileManager.java (from r465389, incubator/roller/trunk/src/org/apache/roller/model/FileManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/FileManager.java?view=diff&rev=465668&p1=incubator/roller/trunk/src/org/apache/roller/model/FileManager.java&r1=465389&p2=incubator/roller/trunk/src/org/apache/roller/business/FileManager.java&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/FileManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/FileManager.java Thu Oct 19 08:57:19 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import java.io.InputStream;
import org.apache.roller.pojos.WeblogResource;
Modified: incubator/roller/trunk/src/org/apache/roller/business/FileManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/FileManagerImpl.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/FileManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/FileManagerImpl.java Thu Oct 19 08:57:19 2006
@@ -31,10 +31,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.FileIOException;
-import org.apache.roller.model.FilePathException;
-import org.apache.roller.model.FileManager;
-import org.apache.roller.model.FileNotFoundException;
+import org.apache.roller.business.FileIOException;
+import org.apache.roller.business.FilePathException;
+import org.apache.roller.business.FileManager;
+import org.apache.roller.business.FileNotFoundException;
import org.apache.roller.pojos.WeblogResource;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.util.RollerMessages;
Copied: incubator/roller/trunk/src/org/apache/roller/business/FileNotFoundException.java (from r465374, incubator/roller/trunk/src/org/apache/roller/model/FileNotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/FileNotFoundException.java?view=diff&rev=465668&p1=incubator/roller/trunk/src/org/apache/roller/model/FileNotFoundException.java&r1=465374&p2=incubator/roller/trunk/src/org/apache/roller/business/FileNotFoundException.java&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/FileNotFoundException.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/FileNotFoundException.java Thu Oct 19 08:57:19 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import org.apache.roller.RollerException;
Copied: incubator/roller/trunk/src/org/apache/roller/business/FilePathException.java (from r465374, incubator/roller/trunk/src/org/apache/roller/model/FilePathException.java)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/FilePathException.java?view=diff&rev=465668&p1=incubator/roller/trunk/src/org/apache/roller/model/FilePathException.java&r1=465374&p2=incubator/roller/trunk/src/org/apache/roller/business/FilePathException.java&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/FilePathException.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/FilePathException.java Thu Oct 19 08:57:19 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.model;
+package org.apache.roller.business;
import org.apache.roller.RollerException;
Modified: incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java Thu Oct 19 08:57:19 2006
@@ -25,7 +25,7 @@
import org.apache.roller.business.referrers.ReferrerQueueManager;
import org.apache.roller.business.referrers.ReferrerQueueManagerImpl;
import org.apache.roller.business.utils.UpgradeDatabase;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.IndexManager;
import org.apache.roller.model.PluginManager;
import org.apache.roller.model.Roller;
Modified: incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/ThemeManagerImpl.java Thu Oct 19 08:57:19 2006
@@ -36,9 +36,9 @@
import org.apache.roller.RollerException;
import org.apache.roller.ThemeNotFoundException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.model.FileIOException;
-import org.apache.roller.model.FileManager;
-import org.apache.roller.model.FilePathException;
+import org.apache.roller.business.FileIOException;
+import org.apache.roller.business.FileManager;
+import org.apache.roller.business.FilePathException;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.ThemeManager;
import org.apache.roller.model.UserManager;
Modified: incubator/roller/trunk/src/org/apache/roller/model/Roller.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/model/Roller.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/Roller.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/model/Roller.java Thu Oct 19 08:57:19 2006
@@ -21,6 +21,7 @@
import java.io.Serializable;
import java.sql.Connection;
import org.apache.roller.RollerException;
+import org.apache.roller.business.FileManager;
import org.apache.roller.business.referrers.ReferrerQueueManager;
import org.apache.roller.planet.model.PlanetManager;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Thu Oct 19 08:57:19 2006
@@ -42,7 +42,7 @@
import org.apache.roller.util.cache.CacheManager;
import org.apache.roller.ui.authoring.struts.formbeans.ImportEntriesForm;
import org.apache.commons.lang.StringUtils;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.pojos.WeblogResource;
/**
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Thu Oct 19 08:57:19 2006
@@ -30,9 +30,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.FileIOException;
-import org.apache.roller.model.FileNotFoundException;
-import org.apache.roller.model.FilePathException;
+import org.apache.roller.business.FileIOException;
+import org.apache.roller.business.FileNotFoundException;
+import org.apache.roller.business.FilePathException;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
@@ -44,7 +44,7 @@
import org.apache.struts.upload.FormFile;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.WeblogResource;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java Thu Oct 19 08:57:19 2006
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.ThemeManager;
import org.apache.roller.pojos.Theme;
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Thu Oct 19 08:57:19 2006
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.ThemeManager;
import org.apache.roller.pojos.Theme;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Thu Oct 19 08:57:19 2006
@@ -34,7 +34,7 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.UserData;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java Thu Oct 19 08:57:19 2006
@@ -33,7 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.WeblogManager;
Modified: incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java?view=diff&rev=465668&r1=465667&r2=465668
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java Thu Oct 19 08:57:19 2006
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.TestUtils;
-import org.apache.roller.model.FileManager;
+import org.apache.roller.business.FileManager;
import org.apache.roller.model.PropertiesManager;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.RollerPropertyData;