roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r542723 [3/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/org...
Date Wed, 30 May 2007 02:18:48 GMT
Modified: roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.business.jpa;
+package org.apache.roller.weblogger.business.jpa;
 
 import java.sql.Timestamp;
 import javax.persistence.NoResultException;
@@ -24,14 +24,14 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.roller.RollerException;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.business.pings.AutoPingManager;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.*;
+import org.apache.roller.weblogger.business.BookmarkManager;
+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.business.pings.AutoPingManager;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.pojos.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,6 +44,7 @@
 import java.util.Collection;
 import java.util.Comparator;
 import javax.persistence.Query;
+import org.apache.roller.business.jpa.JPAPersistenceStrategy;
 
 /*
  * JPAUserManagerImpl.java
@@ -281,7 +282,7 @@
     }
     
     /**
-     * @see org.apache.roller.model.UserManager#storePage(org.apache.roller.pojos.WeblogTemplate)
+     * @see org.apache.roller.weblogger.model.UserManager#storePage(org.apache.roller.weblogger.pojos.WeblogTemplate)
      */
     public void savePage(WeblogTemplate page) throws RollerException {
         this.strategy.store(page);
@@ -887,7 +888,7 @@
     }
     
     /**
-     * @see org.apache.roller.model.UserManager#getPageByAction(Weblog, java.lang.String)
+     * @see org.apache.roller.weblogger.model.UserManager#getPageByAction(Weblog, java.lang.String)
      */
     public WeblogTemplate getPageByAction(Weblog website, String action)
             throws RollerException {
@@ -910,7 +911,7 @@
     }
     
     /**
-     * @see org.apache.roller.model.UserManager#getPageByName(Weblog, java.lang.String)
+     * @see org.apache.roller.weblogger.model.UserManager#getPageByName(Weblog, java.lang.String)
      */
     public WeblogTemplate getPageByName(Weblog website, String pagename)
     throws RollerException {
@@ -932,7 +933,7 @@
     }
     
     /**
-     * @see org.apache.roller.model.UserManager#getPages(Weblog)
+     * @see org.apache.roller.weblogger.model.UserManager#getPages(Weblog)
      */
     public List getPages(Weblog website) throws RollerException {
         if (website == null)

Modified: roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.jpa;
+package org.apache.roller.weblogger.business.jpa;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -37,26 +37,27 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.business.jpa.JPAPersistenceStrategy;
 
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogHitCount;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.StatCount;
-import org.apache.roller.pojos.TagStat;
-import org.apache.roller.pojos.TagStatComparator;
-import org.apache.roller.pojos.TagStatCountComparator;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.WeblogEntryTagAggregate;
-import org.apache.roller.pojos.WeblogEntryTag;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.pojos.WeblogEntryAttribute;
-import org.apache.roller.pojos.StatCountCountComparator;
-import org.apache.roller.pojos.User;
-import org.apache.roller.util.DateUtil;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogHitCount;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.StatCount;
+import org.apache.roller.weblogger.pojos.TagStat;
+import org.apache.roller.weblogger.pojos.TagStatComparator;
+import org.apache.roller.weblogger.pojos.TagStatCountComparator;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
+import org.apache.roller.weblogger.pojos.WeblogEntryTag;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
+import org.apache.roller.weblogger.pojos.StatCountCountComparator;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.util.DateUtil;
 
 /*
  * JPAWeblogManagerImpl.java

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/AutoPingManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/AutoPingManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/AutoPingManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/AutoPingManager.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import java.util.Collection;
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.AutoPing;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.AutoPing;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueManager.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.AutoPing;
-import org.apache.roller.pojos.PingQueueEntry;
+import org.apache.roller.weblogger.pojos.AutoPing;
+import org.apache.roller.weblogger.pojos.PingQueueEntry;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java Tue May 29 19:18:07 2007
@@ -16,19 +16,19 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.config.PingConfig;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.PingQueueEntry;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.config.PingConfig;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.PingQueueEntry;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/PingQueueTask.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -24,16 +24,16 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.runnable.RollerTaskWithLeasing;
-import org.apache.roller.config.PingConfig;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
+import org.apache.roller.weblogger.config.PingConfig;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**
  * Task for processing the ping queue at fixed intervals.   This is set up during context initialization by {@link
- * org.apache.roller.ui.core.RollerContext}.  The queue processing interval is currently set from the configuration {@link
- * org.apache.roller.config.PingConfig} at startup time only.
+ * org.apache.roller.weblogger.ui.core.RollerContext}.  The queue processing interval is currently set from the configuration {@link
+ * org.apache.roller.weblogger.config.PingConfig} at startup time only.
  *
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/PingTargetManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/PingTargetManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/PingTargetManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/PingTargetManager.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.pings;
+package org.apache.roller.weblogger.business.pings;
 
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.config.PingConfig;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.config.PingConfig;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.xmlrpc.XmlRpcException;
 import org.apache.xmlrpc.client.XmlRpcClient;
 import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/IncomingReferrer.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/IncomingReferrer.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/IncomingReferrer.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/IncomingReferrer.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on December 20, 2005, 3:39 PM
  */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
 /**
  * Represents an incoming (unprocessed) referrer.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java Tue May 29 19:18:07 2007
@@ -21,9 +21,9 @@
  * Created on December 20, 2005, 3:08 PM
  */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/RefererManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/RefererManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/RefererManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/RefererManager.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * Interface to Referer management.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java Tue May 29 19:18:07 2007
@@ -21,16 +21,16 @@
  * Created on December 16, 2005, 6:26 PM
  */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.runnable.Job;
-import org.apache.roller.business.referrers.RefererManager;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.runnable.Job;
+import org.apache.roller.weblogger.business.referrers.RefererManager;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManager.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on December 16, 2005, 5:37 PM
  */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
 /**
  * A queue for incoming referrers.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on December 16, 2005, 5:06 PM
  */
 
-package org.apache.roller.business.referrers;
+package org.apache.roller.weblogger.business.referrers;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,10 +31,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.runnable.ContinuousWorkerThread;
-import org.apache.roller.business.runnable.WorkerThread;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
+import org.apache.roller.weblogger.business.runnable.WorkerThread;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -25,11 +25,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.HitCountQueue;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.HitCountQueue;
+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.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/Job.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/Job.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/Job.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/Job.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on December 16, 2005, 6:14 PM
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Map;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
 
 
 /**
@@ -149,4 +149,4 @@
         }
     }
     
-}
\ No newline at end of file
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTask.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 import java.util.Enumeration;
@@ -24,8 +24,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.util.DateUtil;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.util.DateUtil;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -25,11 +25,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.business.search.IndexManager;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/TaskRunner.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/TaskRunner.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/TaskRunner.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/TaskRunner.java Tue May 29 19:18:07 2007
@@ -15,10 +15,10 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
         
 import java.io.File;
-import org.apache.roller.util.StandaloneWebappClassLoader;
+import org.apache.roller.weblogger.util.StandaloneWebappClassLoader;
 
 /**
  * Sets up classpath for running a Roller task outside of the Roller webapp. 
@@ -70,9 +70,9 @@
     -Dplanet.custom.config=planet-custom.properties \
     -Dcatalina.base=. \
     -cp ./build/webapp/WEB-INF/lib/roller-business.jar \
-    org.apache.roller.business.runnable.TaskRunner \
+    org.apache.roller.weblogger.business.runnable.TaskRunner \
     ~/roller_trunk/sandbox/planetroller/build/webapp \
     /Applications/Java/jakarta-tomcat-5.5.9/common/lib \
-    org.apache.roller.planet.tasks.GeneratePlanetTask
+    org.apache.roller.weblogger.planet.tasks.GeneratePlanetTask
  
  */

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManager.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
@@ -28,7 +28,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerConfig;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import java.util.Date;
 import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**
@@ -149,4 +149,4 @@
         }
     }
     
-}
\ No newline at end of file
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/business/runnable/WorkerThread.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/runnable/WorkerThread.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/runnable/WorkerThread.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/runnable/WorkerThread.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.runnable;
+package org.apache.roller.weblogger.business.runnable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/FieldConstants.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/FieldConstants.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/FieldConstants.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/FieldConstants.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 19, 2003 */
-package org.apache.roller.business.search;
+package org.apache.roller.weblogger.business.search;
 
 /**
  * Field constants for indexing blog entries and comments.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManager.java Tue May 29 19:18:07 2007
@@ -15,13 +15,13 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.business.search;
+package org.apache.roller.weblogger.business.search;
 
 import org.apache.roller.RollerException;
-import org.apache.roller.business.search.operations.IndexOperation;
-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.operations.IndexOperation;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * Interface to Roller's Lucene-based search facility.
@@ -58,4 +58,5 @@
     public abstract void rebuildWebsiteIndex(Weblog website) throws RollerException;
 
     public abstract void rebuildWebsiteIndex() throws RollerException;
-}
\ No newline at end of file
+
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.search;
+package org.apache.roller.weblogger.business.search;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,21 +31,21 @@
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.*;
-import org.apache.roller.business.search.operations.AddEntryOperation;
-import org.apache.roller.business.search.operations.IndexOperation;
-import org.apache.roller.business.search.operations.ReIndexEntryOperation;
-import org.apache.roller.business.search.operations.RebuildWebsiteIndexOperation;
-import org.apache.roller.business.search.operations.RemoveEntryOperation;
-import org.apache.roller.business.search.operations.RemoveWebsiteIndexOperation;
-import org.apache.roller.business.search.operations.WriteToIndexOperation;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.*;
+import org.apache.roller.weblogger.business.search.operations.AddEntryOperation;
+import org.apache.roller.weblogger.business.search.operations.IndexOperation;
+import org.apache.roller.weblogger.business.search.operations.ReIndexEntryOperation;
+import org.apache.roller.weblogger.business.search.operations.RebuildWebsiteIndexOperation;
+import org.apache.roller.weblogger.business.search.operations.RemoveEntryOperation;
+import org.apache.roller.weblogger.business.search.operations.RemoveWebsiteIndexOperation;
+import org.apache.roller.weblogger.business.search.operations.WriteToIndexOperation;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
 import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.business.RollerFactory;
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -355,4 +355,5 @@
             // won't happen, since it was
         }
     }
-}
\ No newline at end of file
+
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/IndexUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/IndexUtil.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/IndexUtil.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/IndexUtil.java Tue May 29 19:18:07 2007
@@ -16,13 +16,13 @@
  * directory of this distribution.
  */
 /* Created on Jul 20, 2003 */
-package org.apache.roller.business.search;
+package org.apache.roller.weblogger.business.search;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.index.Term;
-import org.apache.roller.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
 
 import java.io.IOException;
 import java.io.StringReader;

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 
@@ -24,11 +24,11 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntry;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
 
 /**
  * An operation that adds a new log entry into the index.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
 * directory of this distribution.
 */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -28,13 +28,13 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.util.Utilities;
-import org.apache.roller.config.RollerConfig;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.FieldConstants;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.util.Utilities;
+import org.apache.roller.weblogger.config.RollerConfig;
 
 /**
  * This is the base class for all index operation. 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 
@@ -26,12 +26,12 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntry;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.FieldConstants;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
 
 /**
  * An operation that adds a new log entry into the index.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.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.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
 
 /**
  * @author aim4min
@@ -43,4 +43,4 @@
         }
     }
     
-}
\ No newline at end of file
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -30,15 +30,15 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.business.search.IndexUtil;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-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.FieldConstants;
+import org.apache.roller.weblogger.business.search.IndexUtil;
+import org.apache.roller.weblogger.business.Roller;
+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.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * An index operation that rebuilds a given users index (or all indexes).

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 
@@ -25,11 +25,11 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.pojos.WeblogEntry;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.FieldConstants;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 16, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 import java.util.Date;
@@ -26,12 +26,12 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.business.search.IndexUtil;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.FieldConstants;
+import org.apache.roller.weblogger.business.search.IndexUtil;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/SearchOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/SearchOperation.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 /* Created on Jul 18, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import java.io.IOException;
 
@@ -34,10 +34,10 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TermQuery;
-import org.apache.roller.business.search.IndexManagerImpl;
-import org.apache.roller.business.search.FieldConstants;
-import org.apache.roller.business.search.IndexUtil;
-import org.apache.roller.business.search.IndexManager;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.FieldConstants;
+import org.apache.roller.weblogger.business.search.IndexUtil;
+import org.apache.roller.weblogger.business.search.IndexManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java Tue May 29 19:18:07 2007
@@ -16,11 +16,11 @@
  * directory of this distribution.
  */
 /* Created on Aug 12, 2003 */
-package org.apache.roller.business.search.operations;
+package org.apache.roller.weblogger.business.search.operations;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.search.IndexManagerImpl;
+import org.apache.roller.weblogger.business.search.IndexManagerImpl;
 
 /**
  * An operation that writes to index.

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedTheme.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedTheme.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedTheme.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.File;
 import java.io.Serializable;
@@ -27,9 +27,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,9 +31,9 @@
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java Tue May 29 19:18:07 2007
@@ -16,13 +16,13 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.Serializable;
-import org.apache.roller.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeResource;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.Serializable;
 import java.util.Date;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import org.apache.roller.RollerException;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManager.java Tue May 29 19:18:07 2007
@@ -16,13 +16,13 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,16 +33,16 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.ThemeTemplate;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**
@@ -94,7 +94,7 @@
     
     
     /**
-     * @see org.apache.roller.model.ThemeManager#getTheme(java.lang.String)
+     * @see org.apache.roller.weblogger.model.ThemeManager#getTheme(java.lang.String)
      */
     public SharedTheme getTheme(String id) 
             throws ThemeNotFoundException, RollerException {
@@ -112,7 +112,7 @@
     
     
     /**
-     * @see org.apache.roller.model.ThemeManager#getTheme(weblog)
+     * @see org.apache.roller.weblogger.model.ThemeManager#getTheme(weblog)
      */
     public WeblogTheme getTheme(Weblog weblog) throws RollerException {
         
@@ -144,7 +144,7 @@
 
     
     /**
-     * @see org.apache.roller.model.ThemeManager#getEnabledThemesList()
+     * @see org.apache.roller.weblogger.model.ThemeManager#getEnabledThemesList()
      *
      * TODO: reimplement enabled vs. disabled logic once we support it
      */
@@ -160,7 +160,7 @@
     
     
     /**
-     * @see org.apache.roller.model.ThemeManager#importTheme(website, theme)
+     * @see org.apache.roller.weblogger.model.ThemeManager#importTheme(website, theme)
      */
     public void importTheme(Weblog website, SharedTheme theme)
             throws RollerException {

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadata.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadata.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadata.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import org.apache.roller.RollerException;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeParsingException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeParsingException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeParsingException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/ThemeParsingException.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import org.apache.roller.RollerException;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java Tue May 29 19:18:07 2007
@@ -16,20 +16,20 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.util.Date;
 import java.util.List;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.FileNotFoundException;
-import org.apache.roller.business.FilePathException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.ThemeTemplate;
-import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.FileNotFoundException;
+import org.apache.roller.weblogger.business.FilePathException;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.themes;
+package org.apache.roller.weblogger.business.themes;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,15 +27,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.FileNotFoundException;
-import org.apache.roller.business.FilePathException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.pojos.ThemeTemplate;
-import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.FileNotFoundException;
+import org.apache.roller.weblogger.business.FilePathException;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/business/utils/PasswordUtility.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/utils/PasswordUtility.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/utils/PasswordUtility.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/utils/PasswordUtility.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.business.utils;
+package org.apache.roller.weblogger.business.utils;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -26,7 +26,7 @@
 import java.sql.ResultSet;
 import java.util.Enumeration;
 import java.util.Properties;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.util.Utilities;
 
 /**
  * Roller password utility: don't run this unless you know what you are doing!</br >
@@ -40,7 +40,7 @@
  * 
  * <p>Usage:<br />
  * 
- * java -cp ./WEB-INF/lib/rollerbeans.jar;./jdbc.jar org.apache.roller.business.utils.PasswordUtility<br />
+ * java -cp ./WEB-INF/lib/rollerbeans.jar;./jdbc.jar org.apache.roller.weblogger.business.utils.PasswordUtility<br />
  * 
  * <br />Options:<br />
  * 

Modified: roller/trunk/src/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.business.utils;
+package org.apache.roller.weblogger.business.utils;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
 
 
 /**
@@ -170,7 +170,7 @@
             PreparedStatement setCustomThemeStmt = con.prepareStatement(
                     "update website set editortheme = ?");
             
-            setCustomThemeStmt.setString(1, org.apache.roller.pojos.WeblogTheme.CUSTOM);
+            setCustomThemeStmt.setString(1, org.apache.roller.weblogger.pojos.WeblogTheme.CUSTOM);
             setCustomThemeStmt.executeUpdate();
             
             if (!con.getAutoCommit()) con.commit();

Copied: roller/trunk/src/org/apache/roller/weblogger/config/PingConfig.java (from r542721, roller/trunk/src/org/apache/roller/config/PingConfig.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/PingConfig.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/config/PingConfig.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/config/PingConfig.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/config/PingConfig.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/PingConfig.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.config;
+package org.apache.roller.weblogger.config;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.PingTarget;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.PingTarget;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -202,7 +202,7 @@
      * Note: this is expected to be called during initialization  with transaction demarcation being handled by the
      * caller.
      *
-     * @see org.apache.roller.ui.core.RollerContext#contextInitialized(javax.servlet.ServletContextEvent)
+     * @see org.apache.roller.weblogger.ui.core.RollerContext#contextInitialized(javax.servlet.ServletContextEvent)
      */
     public static void initializeCommonTargets() throws RollerException {
         String configuredVal = RollerConfig.getProperty(PINGS_INITIAL_COMMON_TARGETS_PROP);

Copied: roller/trunk/src/org/apache/roller/weblogger/config/RollerConfig.java (from r542721, roller/trunk/src/org/apache/roller/config/RollerConfig.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/RollerConfig.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/config/RollerConfig.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/config/RollerConfig.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/config/RollerConfig.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/RollerConfig.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.config;
+package org.apache.roller.weblogger.config;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,7 +25,7 @@
 import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.util.PropertyExpander;
+import org.apache.roller.weblogger.util.PropertyExpander;
 
 
 /**
@@ -53,7 +53,7 @@
 
         try {
             // we'll need this to get at our properties files in the classpath
-            Class config_class = Class.forName("org.apache.roller.config.RollerConfig");
+            Class config_class = Class.forName("org.apache.roller.weblogger.config.RollerConfig");
 
             // first, lets load our default properties
             InputStream is = config_class.getResourceAsStream(default_config);

Copied: roller/trunk/src/org/apache/roller/weblogger/config/RollerRuntimeConfig.java (from r542721, roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/RollerRuntimeConfig.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/config/RollerRuntimeConfig.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/config/RollerRuntimeConfig.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/RollerRuntimeConfig.java Tue May 29 19:18:07 2007
@@ -16,18 +16,18 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.config;
+package org.apache.roller.weblogger.config;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.config.runtime.RuntimeConfigDefs;
-import org.apache.roller.config.runtime.RuntimeConfigDefsParser;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
+import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefsParser;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/config/runtime/ConfigDef.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/runtime/ConfigDef.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/config/runtime/ConfigDef.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/runtime/ConfigDef.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on June 4, 2005, 1:10 PM
  */
 
-package org.apache.roller.config.runtime;
+package org.apache.roller.weblogger.config.runtime;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: roller/trunk/src/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/runtime/DisplayGroup.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/config/runtime/DisplayGroup.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/runtime/DisplayGroup.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on June 4, 2005, 1:10 PM
  */
 
-package org.apache.roller.config.runtime;
+package org.apache.roller.weblogger.config.runtime;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: roller/trunk/src/org/apache/roller/weblogger/config/runtime/PropertyDef.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/runtime/PropertyDef.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/config/runtime/PropertyDef.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/runtime/PropertyDef.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on June 4, 2005, 1:13 PM
  */
 
-package org.apache.roller.config.runtime;
+package org.apache.roller.weblogger.config.runtime;
 
 /**
  * Represents the definition of a single runtime property.

Modified: roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on June 4, 2005, 1:06 PM
  */
 
-package org.apache.roller.config.runtime;
+package org.apache.roller.weblogger.config.runtime;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
  * Created on June 4, 2005, 1:57 PM
  */
 
-package org.apache.roller.config.runtime;
+package org.apache.roller.weblogger.config.runtime;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: roller/trunk/src/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.planet.business;
+package org.apache.roller.weblogger.planet.business;
 
 import com.sun.syndication.fetcher.impl.FeedFetcherCache;
 import java.text.MessageFormat;
@@ -31,15 +31,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.PluginManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.config.RollerRuntimeConfig;
+import org.apache.roller.planet.business.PlanetFactory;
+import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.business.RomeFeedFetcher;
 import org.apache.roller.planet.pojos.PlanetEntryData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.PluginManager;
+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.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
 
 /**
  * Extends Roller Planet's feed fetcher to fetch local feeds directly from Roller.

Modified: roller/trunk/src/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java Tue May 29 19:18:07 2007
@@ -15,14 +15,15 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-package org.apache.roller.planet.business.hibernate;
+package org.apache.roller.weblogger.planet.business.hibernate;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
-import org.apache.roller.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerConfig;
 import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.hibernate.HibernatePlanetImpl;
 
 /**
  * Roller specific Planet implementation, uses RollerConfig to configure Hibernate.

Modified: roller/trunk/src/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java Tue May 29 19:18:07 2007
@@ -16,17 +16,18 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.planet.business.jpa;
+package org.apache.roller.weblogger.planet.business.jpa;
 
 import java.util.Enumeration;
 import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.DatabaseProvider;
+import org.apache.roller.weblogger.business.DatabaseProvider;
 import org.apache.roller.business.jpa.JPAPersistenceStrategy;
-import org.apache.roller.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerConfig;
 import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.jpa.JPAPlanetImpl;
 import org.apache.roller.planet.config.PlanetConfig;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.planet.tasks;
+package org.apache.roller.weblogger.planet.tasks;
 
 import java.util.Date;
 import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.runnable.RollerTaskWithLeasing;
+import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
 import org.apache.roller.planet.config.PlanetConfig;
 import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;



Mime
View raw message