svn commit: r542723 [11/12] - in /roller/trunk: ./ nbproject/ src/META-INF/ src/org/apache/roller/ src/org/apache/roller/business/ src/org/apache/roller/config/ src/org/apache/roller/planet/ src/org/apache/roller/pojos/ src/org/apache/roller/ui/ src/or...

[ag...@apache.org]

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/FileManagerTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/FileManagerTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/FileManagerTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/FileManagerTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/FileManagerTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/FileManagerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/FileManagerTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.io.InputStream;
 import java.util.Map;
@@ -25,11 +25,11 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.RuntimeConfigProperty;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * Test File Management business layer operations.

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/FolderCRUDTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/FolderCRUDTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/FolderCRUDTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/FolderCRUDTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/FolderCRUDTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/FolderCRUDTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/FolderCRUDTest.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/FolderFunctionalityTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/FolderFunctionalityTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/FolderFunctionalityTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/FolderFunctionalityTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -26,10 +26,10 @@
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * Test folder business functions and lookups.

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/FolderParentDeletesTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/FolderParentDeletesTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/FolderParentDeletesTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/FolderParentDeletesTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/FolderParentDeletesTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/FolderParentDeletesTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/FolderParentDeletesTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.Iterator;
 import java.util.List;
@@ -25,10 +25,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/HitCountTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/HitCountTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/HitCountTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/HitCountTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/HitCountTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/HitCountTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/HitCountTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.Iterator;
 import java.util.List;
@@ -25,12 +25,12 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogHitCount;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogHitCount;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/IndexManagerTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/IndexManagerTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/IndexManagerTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/IndexManagerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/IndexManagerTest.java Tue May 29 19:18:07 2007
@@ -15,21 +15,21 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.sql.Timestamp;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.operations.AddEntryOperation;
-import org.apache.roller.business.search.operations.RemoveEntryOperation;
-import org.apache.roller.business.search.operations.SearchOperation;
-import org.apache.roller.business.search.IndexManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.operations.AddEntryOperation;
+import org.apache.roller.weblogger.business.search.operations.RemoveEntryOperation;
+import org.apache.roller.weblogger.business.search.operations.SearchOperation;
+import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/PermissionTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/PermissionTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/PermissionTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/PermissionTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/PermissionTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/PermissionTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/PermissionTest.java Tue May 29 19:18:07 2007
@@ -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.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.List;
 import junit.framework.Test;
@@ -23,12 +23,12 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/PingsTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/PingsTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/PingsTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/PingsTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/PingsTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/PingsTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/PingsTest.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on April 9, 2006, 1:27 PM
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,14 +30,14 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.pings.AutoPingManager;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.AutoPing;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.pings.AutoPingManager;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.AutoPing;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/PlanetManagerLocalTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java Tue May 29 19:18:07 2007
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.sql.Timestamp;
 import java.util.Date;
@@ -24,16 +24,16 @@
 import junit.textui.TestRunner;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.planet.tasks.RefreshRollerPlanetTask;
-import org.apache.roller.planet.tasks.SyncWebsitesTask;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.planet.tasks.RefreshRollerPlanetTask;
+import org.apache.roller.weblogger.planet.tasks.SyncWebsitesTask;
 
 
 

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/PropertiesTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/PropertiesTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/PropertiesTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/PropertiesTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/PropertiesTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/PropertiesTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/PropertiesTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.Map;
 import junit.framework.Test;
@@ -24,10 +24,10 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/RefererTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/RefererTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/RefererTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/RefererTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/RefererTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/RefererTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/RefererTest.java Tue May 29 19:18:07 2007
@@ -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.business;
+package org.apache.roller.weblogger.business;
 
 import java.sql.Timestamp;
 import java.util.Calendar;
@@ -27,16 +27,16 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.referrers.RefererManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.RuntimeConfigProperty;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.DateUtil;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.referrers.RefererManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.util.DateUtil;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/SupplementalWeblogServicesTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/business/SupplementalWeblogServicesTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/SupplementalWeblogServicesTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/SupplementalWeblogServicesTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/SupplementalWeblogServicesTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/SupplementalWeblogServicesTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/SupplementalWeblogServicesTestSuite.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/TaskLockTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/TaskLockTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/TaskLockTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/TaskLockTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/TaskLockTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/TaskLockTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/TaskLockTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.Date;
 import junit.framework.Test;
@@ -24,10 +24,10 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.runnable.RollerTask;
-import org.apache.roller.business.runnable.RollerTaskWithLeasing;
-import org.apache.roller.business.runnable.ThreadManager;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.runnable.RollerTask;
+import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
+import org.apache.roller.weblogger.business.runnable.ThreadManager;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/UserTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/UserTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/UserTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/UserTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/UserTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/UserTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/UserTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,10 +26,10 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogCategoryCRUDTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogCategoryCRUDTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogCategoryCRUDTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java Tue May 29 19:18:07 2007
@@ -16,17 +16,17 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.List;
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogCategoryFunctionalityTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogCategoryFunctionalityTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogCategoryFunctionalityTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.Iterator;
 import java.util.List;
@@ -24,12 +24,12 @@
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogCategoryParentDeletesTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogCategoryParentDeletesTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogCategoryParentDeletesTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java Tue May 29 19:18:07 2007
@@ -16,16 +16,16 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogEntryTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogEntryTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogEntryTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogEntryTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogEntryTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogEntryTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogEntryTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -33,14 +33,14 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.TagStat;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.WeblogEntryTag;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.TagStat;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogEntryTag;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogPageTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogPageTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogPageTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogPageTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogPageTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogPageTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogPageTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.List;
 import junit.framework.Test;
@@ -24,12 +24,12 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogStatsTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogStatsTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogStatsTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogStatsTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogStatsTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogStatsTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogStatsTest.java Tue May 29 19:18:07 2007
@@ -1,17 +1,17 @@
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.List;
 import java.util.Map;
 import junit.framework.TestCase;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.StatCount;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.StatCount;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  *

Copied: roller/trunk/tests/org/apache/roller/weblogger/business/WeblogTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/WeblogTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/WeblogTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/WeblogTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/WeblogTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/WeblogTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/WeblogTest.java Tue May 29 19:18:07 2007
@@ -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.business;
+package org.apache.roller.weblogger.business;
 
 import java.util.List;
 import junit.framework.Test;
@@ -23,12 +23,12 @@
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.StatCount;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.StatCount;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Copied: roller/trunk/tests/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java (from r542721, roller/trunk/tests/org/apache/roller/ui/ApplicationResourcesTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ui/ApplicationResourcesTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ui/ApplicationResourcesTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java Tue May 29 19:18:07 2007
@@ -20,7 +20,7 @@
  * 
  * Created on 24-May-04
  */
-package org.apache.roller.ui;
+package org.apache.roller.weblogger.ui;
 
 import java.io.FileInputStream;
 import java.util.Iterator;

Copied: roller/trunk/tests/org/apache/roller/weblogger/ui/MockAcegiUserDetailsService.java (from r542721, roller/trunk/tests/org/apache/roller/ui/MockAcegiUserDetailsService.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/MockAcegiUserDetailsService.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ui/MockAcegiUserDetailsService.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ui/MockAcegiUserDetailsService.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ui/MockAcegiUserDetailsService.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/MockAcegiUserDetailsService.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui;
+package org.apache.roller.weblogger.ui;
 
 import org.acegisecurity.GrantedAuthority;
 import org.acegisecurity.GrantedAuthorityImpl;

Copied: roller/trunk/tests/org/apache/roller/weblogger/ui/MockPrincipal.java (from r542721, roller/trunk/tests/org/apache/roller/ui/MockPrincipal.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/MockPrincipal.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ui/MockPrincipal.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ui/MockPrincipal.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ui/MockPrincipal.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/MockPrincipal.java Tue May 29 19:18:07 2007
@@ -18,7 +18,7 @@
 /*
  * Created on Mar 8, 2004
  */
-package org.apache.roller.ui;
+package org.apache.roller.weblogger.ui;
 
 import java.security.Principal;
 
@@ -30,4 +30,4 @@
     public String getName() {
         return mName;
     }
-}
\ No newline at end of file
+}

Copied: roller/trunk/tests/org/apache/roller/weblogger/ui/MockRollerContext.java (from r542721, roller/trunk/tests/org/apache/roller/ui/MockRollerContext.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/MockRollerContext.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ui/MockRollerContext.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ui/MockRollerContext.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ui/MockRollerContext.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/MockRollerContext.java Tue May 29 19:18:07 2007
@@ -1 +1,73 @@
-/*
 * 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 Mar 4, 2004
 */
package org.apache.roller.ui;
import java.io.File;

import javax.servlet.ServletContext;
import javax.servlet.ServletC
 ontextEvent;
import javax.servlet.http.HttpServletRequest;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.ui.core.*;

/**
 * @author lance.lavandowska
 */
public class MockRollerContext extends RollerContext {
    private static Log mLogger =
            LogFactory.getFactory().getInstance(MockRollerContext.class);
    
    private static ServletContext mContext = null;
    
    public void init(ServletContext sc) {
        mLogger.debug("MockRollerContext initializing");
        
        // initialize super
        super.contextInitialized(new ServletContextEvent(sc));
        
        // Save context in self and self in context
        mContext = sc;
        mContext.setAttribute("org.apache.roller.absoluteContextURL", "/");
    }
    
    //-----------------------------------------------------------------------
    /** Because I cannot set the super's values, I have t
 o
     * overide the methods as well */
    public static ServletContext getServletContext() {
        return mContext;
    }
        
    //-----------------------------------------------------------------------
    /** Because I cannot set the super's values, I have to
     * overide the methods as well */
    public String getAbsoluteContextUrl() {
        return "";
    }
    
    //-----------------------------------------------------------------------
    /** Because I cannot set the super's values, I have to
     * overide the methods as well */
    public String getAbsoluteContextUrl(HttpServletRequest request) {
        return "http://localhost:8080/roller";
    }
    
}
\ No newline at end of file
+/*
+ * 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 Mar 4, 2004
+ */
+package org.apache.roller.weblogger.ui;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.ui.core.RollerContext;
+
+/**
+ * @author lance.lavandowska
+ */
+public class MockRollerContext extends RollerContext {
+    private static Log mLogger =
+            LogFactory.getFactory().getInstance(MockRollerContext.class);
+    
+    private static ServletContext mContext = null;
+    
+    public void init(ServletContext sc) {
+        mLogger.debug("MockRollerContext initializing");
+        
+        // initialize super
+        super.contextInitialized(new ServletContextEvent(sc));
+        
+        // Save context in self and self in context
+        mContext = sc;
+        mContext.setAttribute("org.apache.roller.absoluteContextURL", "/");
+    }
+    
+    //-----------------------------------------------------------------------
+    /** Because I cannot set the super's values, I have to
+     * overide the methods as well */
+    public static ServletContext getServletContext() {
+        return mContext;
+    }
+        
+    //-----------------------------------------------------------------------
+    /** Because I cannot set the super's values, I have to
+     * overide the methods as well */
+    public String getAbsoluteContextUrl() {
+        return "";
+    }
+    
+    //-----------------------------------------------------------------------
+    /** Because I cannot set the super's values, I have to
+     * overide the methods as well */
+    public String getAbsoluteContextUrl(HttpServletRequest request) {
+        return "http://localhost:8080/roller";
+    }
+    
+}
+

Copied: roller/trunk/tests/org/apache/roller/weblogger/ui/UIPluginManagerTest.java (from r542721, roller/trunk/tests/org/apache/roller/ui/UIPluginManagerTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/UIPluginManagerTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ui/UIPluginManagerTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ui/UIPluginManagerTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ui/UIPluginManagerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/UIPluginManagerTest.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui;
+package org.apache.roller.weblogger.ui;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.ui.core.RollerContext;
-import org.apache.roller.ui.core.plugins.UIPluginManager;
+import org.apache.roller.weblogger.ui.core.RollerContext;
+import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager;
 
 
 /**

Modified: roller/trunk/tests/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Tue May 29 19:18:07 2007
@@ -16,16 +16,16 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.util;
 
 import junit.framework.TestCase;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.RollerMessages;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.util.RollerMessages;
 
 /**
  *

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/BlacklistTest.java (from r542721, roller/trunk/tests/org/apache/roller/util/BlacklistTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/BlacklistTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/BlacklistTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/BlacklistTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/BlacklistTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/BlacklistTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import java.io.File;
 import junit.framework.Test;

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/LRUCache2Test.java (from r542721, roller/trunk/tests/org/apache/roller/util/LRUCache2Test.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/LRUCache2Test.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/LRUCache2Test.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/LRUCache2Test.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/LRUCache2Test.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/LRUCache2Test.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/LinkbackExtractorTest.java (from r542721, roller/trunk/tests/org/apache/roller/util/LinkbackExtractorTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/LinkbackExtractorTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/LinkbackExtractorTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/LinkbackExtractorTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/LinkbackExtractorTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/LinkbackExtractorTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/PropertyExpanderTest.java (from r542721, roller/trunk/tests/org/apache/roller/util/PropertyExpanderTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/PropertyExpanderTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/PropertyExpanderTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/PropertyExpanderTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/PropertyExpanderTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/PropertyExpanderTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,7 +24,7 @@
 
 
 /**
- * Unit test for org.apache.roller.util.PropertyExpander.
+ * Unit test for org.apache.roller.weblogger.util.PropertyExpander.
  *
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/RegexUtilTest.java (from r542721, roller/trunk/tests/org/apache/roller/util/RegexUtilTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/RegexUtilTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/RegexUtilTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/RegexUtilTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/RegexUtilTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/RegexUtilTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTest.java (from r542721, roller/trunk/tests/org/apache/roller/util/UtilitiesTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/UtilitiesTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/UtilitiesTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/util/UtilitiesTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/util/UtilitiesTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/util/UtilitiesTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/util/UtilitiesTestSuite.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Copied: roller/trunk/tests/org/apache/roller/weblogger/webservices/WebServicesTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/webservices/WebServicesTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/WebServicesTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/webservices/WebServicesTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/webservices/WebServicesTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/webservices/WebServicesTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/WebServicesTestSuite.java Tue May 29 19:18:07 2007
@@ -16,19 +16,19 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.webservices;
+package org.apache.roller.weblogger.webservices;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.roller.webservices.adminapi.AappTest;
-import org.apache.roller.webservices.adminapi.HandlerBaseTest;
-import org.apache.roller.webservices.adminapi.MemberHandlerTest;
-import org.apache.roller.webservices.adminapi.UserHandlerTest;
-import org.apache.roller.webservices.adminapi.WeblogHandlerTest;
-import org.apache.roller.webservices.adminapi.sdk.MemberEntryTest;
-import org.apache.roller.webservices.adminapi.sdk.UserEntryTest;
-import org.apache.roller.webservices.adminapi.sdk.WeblogEntryTest;
-import org.apache.roller.webservices.xmlrpc.RollerXmlRpcServerTest;
+import org.apache.roller.weblogger.webservices.adminapi.AappTest;
+import org.apache.roller.weblogger.webservices.adminapi.HandlerBaseTest;
+import org.apache.roller.weblogger.webservices.adminapi.MemberHandlerTest;
+import org.apache.roller.weblogger.webservices.adminapi.UserHandlerTest;
+import org.apache.roller.weblogger.webservices.adminapi.WeblogHandlerTest;
+import org.apache.roller.weblogger.webservices.adminapi.sdk.MemberEntryTest;
+import org.apache.roller.weblogger.webservices.adminapi.sdk.UserEntryTest;
+import org.apache.roller.weblogger.webservices.adminapi.sdk.WeblogEntryTest;
+import org.apache.roller.weblogger.webservices.xmlrpc.RollerXmlRpcServerTest;
 
 
 /**

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/AappTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/AappTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/AappTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/AappTest.java Tue May 29 19:18:07 2007
@@ -15,18 +15,18 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.webservices.adminapi;
+package org.apache.roller.weblogger.webservices.adminapi;
 
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 import junit.framework.TestCase;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntrySet;
 
 public abstract class AappTest extends TestCase {
     private static final Date sampleDate = new Date();

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java Tue May 29 19:18:07 2007
@@ -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.webservices.adminapi;
+package org.apache.roller.weblogger.webservices.adminapi;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,13 +27,13 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.util.Base64;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntrySet;
 import org.jdom.JDOMException;
 
 public abstract class HandlerBaseTest extends AappTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java Tue May 29 19:18:07 2007
@@ -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.webservices.adminapi;
+package org.apache.roller.weblogger.webservices.adminapi;
 
 import java.io.IOException;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
 import org.jdom.JDOMException;
 
 public class MemberHandlerTest extends HandlerBaseTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java Tue May 29 19:18:07 2007
@@ -15,12 +15,12 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.webservices.adminapi;
+package org.apache.roller.weblogger.webservices.adminapi;
 
 import java.io.IOException;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntrySet;
 import org.jdom.JDOMException;
 
 /**

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java Tue May 29 19:18:07 2007
@@ -15,12 +15,12 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.webservices.adminapi;
+package org.apache.roller.weblogger.webservices.adminapi;
 
 import java.io.IOException;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntrySet;
 import org.jdom.JDOMException;
 
 public class WeblogHandlerTest extends HandlerBaseTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/MemberEntryTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/MemberEntryTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/MemberEntryTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/MemberEntryTest.java Tue May 29 19:18:07 2007
@@ -15,15 +15,15 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.webservices.adminapi.sdk;
+package org.apache.roller.weblogger.webservices.adminapi.sdk;
 
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
 import org.jdom.Document;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import org.apache.roller.webservices.adminapi.AappTest;
+import org.apache.roller.weblogger.webservices.adminapi.AappTest;
 import org.jdom.JDOMException;
 
 public class MemberEntryTest extends AappTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/UserEntryTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/UserEntryTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/UserEntryTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/UserEntryTest.java Tue May 29 19:18:07 2007
@@ -15,15 +15,15 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.webservices.adminapi.sdk;
+package org.apache.roller.weblogger.webservices.adminapi.sdk;
 
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntrySet;
 import org.jdom.Document;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import org.apache.roller.webservices.adminapi.AappTest;
+import org.apache.roller.weblogger.webservices.adminapi.AappTest;
 import org.jdom.JDOMException;
 
 public class UserEntryTest extends AappTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/WeblogEntryTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/WeblogEntryTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/WeblogEntryTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/adminapi/sdk/WeblogEntryTest.java Tue May 29 19:18:07 2007
@@ -15,15 +15,15 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.webservices.adminapi.sdk;
+package org.apache.roller.weblogger.webservices.adminapi.sdk;
 
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntrySet;
 import org.jdom.Document;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import org.apache.roller.webservices.adminapi.AappTest;
+import org.apache.roller.weblogger.webservices.adminapi.AappTest;
 import org.jdom.JDOMException;
 
 public class WeblogEntryTest extends AappTest {

Modified: roller/trunk/tests/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java Tue May 29 19:18:07 2007
@@ -18,7 +18,7 @@
 /*
  * Created on Jun 15, 2004
  */
-package org.apache.roller.webservices.xmlrpc;
+package org.apache.roller.weblogger.webservices.xmlrpc;
 
 import com.mockrunner.mock.web.MockHttpServletRequest;
 import com.mockrunner.mock.web.MockHttpServletResponse;
@@ -40,14 +40,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.ui.MockRollerContext;
-import org.apache.roller.ui.core.RollerRequest;
-import org.apache.roller.util.RegexUtil;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.ui.MockRollerContext;
+import org.apache.roller.weblogger.ui.core.RollerRequest;
+import org.apache.roller.weblogger.util.RegexUtil;
 import org.apache.xmlrpc.webserver.XmlRpcServlet;
 
 
@@ -234,4 +234,5 @@
     public static Test suite() {
         return new TestSuite(RollerXmlRpcServerTest.class);
     }
-}
\ No newline at end of file
+
+}

Modified: roller/trunk/web/WEB-INF/classes/META-INF/tlds/roller.tld
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/META-INF/tlds/roller.tld?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/META-INF/tlds/roller.tld (original)
+++ roller/trunk/web/WEB-INF/classes/META-INF/tlds/roller.tld Tue May 29 19:18:07 2007
@@ -10,16 +10,16 @@
    <uri>http://www.rollerweblogger.org/tags</uri>
 
    <listener>
-      <listener-class>org.apache.roller.ui.core.RollerSession</listener-class>
+      <listener-class>org.apache.roller.weblogger.ui.core.RollerSession</listener-class>
    </listener>
    <listener>
-      <listener-class>org.apache.roller.ui.core.RollerContext</listener-class>
+      <listener-class>org.apache.roller.weblogger.ui.core.RollerContext</listener-class>
    </listener>
 
    <tag>
 
       <name>Menu</name>
-      <tag-class>org.apache.roller.ui.core.tags.menu.MenuTag</tag-class>
+      <tag-class>org.apache.roller.weblogger.ui.core.tags.menu.MenuTag</tag-class>
 
       <attribute>
          <name>id</name>
@@ -40,7 +40,7 @@
    <tag>
 
       <name>Date</name>
-      <tag-class>org.apache.roller.ui.core.tags.DateTag</tag-class>
+      <tag-class>org.apache.roller.weblogger.ui.core.tags.DateTag</tag-class>
 
       <attribute>
          <name>dateFormat</name>
@@ -79,7 +79,7 @@
    <tag>
 
       <name>Calendar</name>
-      <tag-class>org.apache.roller.ui.core.tags.calendar.CalendarTag</tag-class>
+      <tag-class>org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag</tag-class>
 
       <attribute>
          <name>name</name>
@@ -99,7 +99,7 @@
    <tag>
 
       <name>EditorNavigationBar</name>
-      <tag-class>org.apache.roller.ui.core.tags.menu.EditorNavigationBarTag</tag-class>
+      <tag-class>org.apache.roller.weblogger.ui.core.tags.menu.EditorNavigationBarTag</tag-class>
 
       <attribute>
          <name>id</name>

Modified: roller/trunk/web/WEB-INF/classes/ehcache.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/ehcache.xml?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/ehcache.xml (original)
+++ roller/trunk/web/WEB-INF/classes/ehcache.xml Tue May 29 19:18:07 2007
@@ -10,17 +10,17 @@
         timeToLiveSeconds="1200"
         overflowToDisk="false" />
 
-    <cache name="org.apache.roller.pojos.RuntimeConfigProperty"
+    <cache name="org.apache.roller.weblogger.pojos.RuntimeConfigProperty"
         maxElementsInMemory="100"
         eternal="false"
         overflowToDisk="false" />
         
-    <cache name="org.apache.roller.pojos.User"
+    <cache name="org.apache.roller.weblogger.pojos.User"
         maxElementsInMemory="1000"
         eternal="false"
         overflowToDisk="false" />
         
-    <cache name="org.apache.roller.pojos.Weblog"
+    <cache name="org.apache.roller.weblogger.pojos.Weblog"
         maxElementsInMemory="1000"
         eternal="false"
         overflowToDisk="false" />

Modified: roller/trunk/web/WEB-INF/classes/hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/hibernate.cfg.xml?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/hibernate.cfg.xml (original)
+++ roller/trunk/web/WEB-INF/classes/hibernate.cfg.xml Tue May 29 19:18:07 2007
@@ -31,7 +31,7 @@
 
         <!-- use custom thread local Session context -->
         <!--<property name="hibernate.current_session_context_class">thread</property>-->
-        <property name="hibernate.current_session_context_class">org.apache.roller.business.hibernate.ThreadLocalSessionContextNoAutoClose</property>
+        <property name="hibernate.current_session_context_class">org.apache.roller.weblogger.business.hibernate.ThreadLocalSessionContextNoAutoClose</property>
 
         <!-- Hibernate L2 Caching -->
         <property name="hibernate.cache.use_second_level_cache">true</property>
@@ -41,28 +41,28 @@
         
         
         <!-- Map Roller pojo classes -->
-        <mapping resource="org/apache/roller/pojos/RuntimeConfigProperty.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/TaskLock.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/User.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/UserRole.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/RuntimeConfigProperty.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/TaskLock.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/User.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/UserRole.hbm.xml" />
 
-        <mapping resource="org/apache/roller/pojos/Weblog.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogPermission.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogBookmark.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogEntryComment.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogBookmarkFolder.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogTemplate.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogReferrer.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogHitCount.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/AutoPing.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/PingQueueEntry.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/PingTarget.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/Weblog.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogPermission.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogBookmark.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogEntryComment.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogTemplate.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogReferrer.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogHitCount.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/AutoPing.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/PingQueueEntry.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/PingTarget.hbm.xml" />
 
-        <mapping resource="org/apache/roller/pojos/WeblogEntry.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogEntryTag.hbm.xml" />        
-        <mapping resource="org/apache/roller/pojos/WeblogEntryTagAggregate.hbm.xml" />                       
-        <mapping resource="org/apache/roller/pojos/WeblogEntryAttribute.hbm.xml" />
-        <mapping resource="org/apache/roller/pojos/WeblogCategory.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogEntry.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogEntryTag.hbm.xml" />        
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.hbm.xml" />                       
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogEntryAttribute.hbm.xml" />
+        <mapping resource="org/apache/roller/weblogger/pojos/WeblogCategory.hbm.xml" />
         
     </session-factory>
 </hibernate-configuration>

Modified: roller/trunk/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/log4j.properties?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/log4j.properties (original)
+++ roller/trunk/web/WEB-INF/classes/log4j.properties Tue May 29 19:18:07 2007
@@ -25,7 +25,7 @@
 
 # Options are: DEBUG, INFO, WARN, ERROR, FATAL
 # Roller code
-log4j.category.org.apache.roller=INFO
+log4j.category.org.apache.roller.weblogger=INFO
 log4j.category.net.java.roller=INFO
 
 # Roller dependent libraries

Modified: roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties (original)
+++ roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties Tue May 29 19:18:07 2007
@@ -1,3 +1,3 @@
 # Sample ResourceBundle properties file
-blogger=org.apache.roller.webservices.xmlrpc.BloggerAPIHandler
-metaWeblog=org.apache.roller.webservices.xmlrpc.MetaWeblogAPIHandler
+blogger=org.apache.roller.weblogger.webservices.xmlrpc.BloggerAPIHandler
+metaWeblog=org.apache.roller.weblogger.webservices.xmlrpc.MetaWeblogAPIHandler

Modified: roller/trunk/web/WEB-INF/classes/planet-hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/planet-hibernate.cfg.xml?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/planet-hibernate.cfg.xml (original)
+++ roller/trunk/web/WEB-INF/classes/planet-hibernate.cfg.xml Tue May 29 19:18:07 2007
@@ -31,7 +31,7 @@
 
         <!-- use custom thread local Session context -->
         <!--<property name="hibernate.current_session_context_class">thread</property>-->
-        <property name="hibernate.current_session_context_class">org.apache.roller.business.hibernate.ThreadLocalSessionContextNoAutoClose</property>
+        <property name="hibernate.current_session_context_class">org.apache.roller.weblogger.business.hibernate.ThreadLocalSessionContextNoAutoClose</property>
 
         <!-- Hibernate L2 Caching -->
         <property name="hibernate.cache.use_second_level_cache">false</property>

Modified: roller/trunk/web/WEB-INF/classes/planet.properties
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/planet.properties?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/web/WEB-INF/classes/planet.properties (original)
+++ roller/trunk/web/WEB-INF/classes/planet.properties Tue May 29 19:18:07 2007
@@ -52,6 +52,6 @@
 
 # choose a feed fetcher
 feedfetcher.classname=\
-org.apache.roller.planet.business.RollerRomeFeedFetcher
+org.apache.roller.weblogger.planet.business.RollerRomeFeedFetcher