You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/27 07:33:30 UTC
svn commit: r551046 [1/2] - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblogger/business/jpa/
src/java/org/apache/roller/weblogger...
Author: agilliland
Date: Tue Jun 26 22:33:26 2007
New Revision: 551046
URL: http://svn.apache.org/viewvc?view=rev&rev=551046
Log:
renaming Roller interface to Weblogger.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java Tue Jun 26 22:33:26 2007
@@ -28,14 +28,14 @@
/**
- * Provides access to the Roller instance and bootstraps the business tier.
+ * Provides access to the Weblogger instance and bootstraps the business tier.
*/
public final class RollerFactory {
private static final Log log = LogFactory.getLog(RollerFactory.class);
- // a reference to the bootstrapped Roller instance
- private static Roller rollerInstance = null;
+ // a reference to the bootstrapped Weblogger instance
+ private static Weblogger rollerInstance = null;
private static Injector injector = null;
@@ -68,12 +68,12 @@
/**
- * Accessor to the Roller Weblogger business tier.
- *
- * @return Roller An instance of Roller.
+ * Accessor to the Weblogger Weblogger business tier.
+ *
+ * @return Weblogger An instance of Weblogger.
* @throws IllegalStateException If the app has not been properly bootstrapped yet.
*/
- public static final Roller getRoller() {
+ public static final Weblogger getRoller() {
if (rollerInstance == null) {
throw new IllegalStateException("Roller Weblogger has not been bootstrapped yet");
}
@@ -91,12 +91,12 @@
/**
- * Bootstrap the Roller Weblogger business tier.
- *
+ * Bootstrap the Weblogger Weblogger business tier.
+ *
* Bootstrapping the application effectively instantiates all the necessary
* pieces of the business tier and wires them together so that the app is
* ready to run.
- *
+ *
* @throws IllegalStateException If the app has not been properly prepared yet.
* @throws BootstrapException If an error happens during the bootstrap process.
*/
@@ -109,7 +109,7 @@
log.info("Bootstrapping Roller Weblogger business tier");
- rollerInstance = injector.getInstance(Roller.class);
+ rollerInstance = injector.getInstance(Weblogger.class);
log.info("Roller Weblogger business tier successfully bootstrapped");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java Tue Jun 26 22:33:26 2007
@@ -38,13 +38,13 @@
/**
- * The abstract version of the Roller implementation.
- *
- * Here we put code that pertains to *all* implementations of the Roller
+ * The abstract version of the Weblogger implementation.
+ *
+ * Here we put code that pertains to *all* implementations of the Weblogger
* interface, regardless of their persistence strategy.
*/
@com.google.inject.Singleton
-public abstract class RollerImpl implements Roller {
+public abstract class RollerImpl implements Weblogger {
private static Log log = LogFactory.getLog(RollerImpl.class);
@@ -115,7 +115,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getFileManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getFileManager()
*/
public FileManager getFileManager() {
return fileManager;
@@ -123,7 +125,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getThreadManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getThreadManager()
*/
public ThreadManager getThreadManager() {
return threadManager;
@@ -131,7 +135,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getIndexManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getIndexManager()
*/
public IndexManager getIndexManager() {
return indexManager;
@@ -139,7 +145,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getThemeManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getThemeManager()
*/
public ThemeManager getThemeManager() {
return themeManager;
@@ -156,7 +164,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getUserManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getUserManager()
*/
public UserManager getUserManager() {
return userManager;
@@ -164,7 +174,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getBookmarkManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getBookmarkManager()
*/
public BookmarkManager getBookmarkManager() {
return bookmarkManager;
@@ -172,7 +184,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getWeblogManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getWeblogManager()
*/
public WeblogManager getWeblogManager() {
return weblogManager;
@@ -180,7 +194,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getRefererManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getRefererManager()
*/
public RefererManager getRefererManager() {
return refererManager;
@@ -188,7 +204,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getPropertiesManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getPropertiesManager()
*/
public PropertiesManager getPropertiesManager() {
return propertiesManager;
@@ -196,7 +214,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getPingTargetManager()
*/
public PingQueueManager getPingQueueManager() {
return pingQueueManager;
@@ -204,7 +224,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getPingTargetManager()
*/
public AutoPingManager getAutopingManager() {
return autoPingManager;
@@ -212,7 +234,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getPingTargetManager()
*/
public PingTargetManager getPingTargetManager() {
return pingTargetManager;
@@ -220,7 +244,9 @@
/**
- * @see org.apache.roller.weblogger.model.Roller#getPluginManager()
+ *
+ *
+ * @see org.apache.roller.weblogger.modelWebloggerr#getPluginManager()
*/
public PluginManager getPagePluginManager() {
return pluginManager;
@@ -314,19 +340,25 @@
}
- /** Roller version */
+ /**
+ * Weblogger version
+ */
public String getVersion() {
return version;
}
- /** Roller build time */
+ /**
+ * Weblogger build time
+ */
public String getBuildTime() {
return buildTime;
}
- /** Get username that built Roller */
+ /**
+ * Get username that built Weblogger
+ */
public String getBuildUser() {
return buildUser;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
@@ -52,12 +52,12 @@
private static Log log = LogFactory.getLog(HibernateAutoPingManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@com.google.inject.Inject
- protected HibernateAutoPingManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateAutoPingManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Auto Ping Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -35,7 +35,7 @@
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
/**
@@ -48,7 +48,7 @@
private static Log log = LogFactory.getLog(HibernateBookmarkManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@@ -57,7 +57,7 @@
* @param roller
*/
@com.google.inject.Inject
- protected HibernateBookmarkManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateBookmarkManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Bookmark Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -31,7 +31,7 @@
import org.apache.roller.weblogger.pojos.PingQueueEntry;
import java.sql.Timestamp;
import java.util.List;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
@@ -47,12 +47,12 @@
private static Log log = LogFactory.getLog(HibernatePingQueueManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@com.google.inject.Inject
- protected HibernatePingQueueManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernatePingQueueManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Ping Queue Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -35,7 +35,7 @@
import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.AutoPing;
@@ -54,12 +54,12 @@
private static Log log = LogFactory.getLog(HibernatePingTargetManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@com.google.inject.Inject
- protected HibernatePingTargetManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernatePingTargetManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Ping Target Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -35,7 +35,7 @@
import org.apache.roller.weblogger.config.runtime.PropertyDef;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
@@ -49,7 +49,7 @@
private static Log log = LogFactory.getLog(HibernatePropertiesManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@@ -57,7 +57,7 @@
* Creates a new instance of HibernatePropertiesManagerImpl
*/
@com.google.inject.Inject
- protected HibernatePropertiesManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernatePropertiesManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Properties Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -45,7 +45,7 @@
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.dialect.Dialect;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.StatCount;
@@ -67,14 +67,14 @@
protected static final String DAYHITS = "dayHits";
protected static final String TOTALHITS = "totalHits";
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
private Date mRefDate = new Date();
@com.google.inject.Inject
- protected HibernateRefererManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateRefererManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Referer Manager");
this.strategy = strat;
@@ -216,7 +216,7 @@
}
/**
- * Use Hibernate directly because Roller's Query API does too much allocation.
+ * Use Hibernate directly because Weblogger's Query API does too much allocation.
*/
protected List getExistingReferers(Weblog website, String dateString,
String permalink) throws WebloggerException {
@@ -236,7 +236,7 @@
}
/**
- * Use Hibernate directly because Roller's Query API does too much allocation.
+ * Use Hibernate directly because Weblogger's Query API does too much allocation.
*/
protected List getMatchingReferers(Weblog website, String requestUrl,
String refererUrl) throws WebloggerException {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.runnable.ThreadManagerImpl;
import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.pojos.TaskLock;
@@ -44,12 +44,12 @@
private static Log log = LogFactory.getLog(HibernateThreadManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
@com.google.inject.Inject
- protected HibernateThreadManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateThreadManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
super();
log.debug("Instantiating Hibernate Thread Manager");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -41,7 +41,7 @@
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -73,7 +73,7 @@
private static Log log = LogFactory.getLog(HibernateUserManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
// cached mapping of weblogHandles -> weblogIds
@@ -84,7 +84,7 @@
@com.google.inject.Inject
- protected HibernateUserManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateUserManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate User Manager");
this.roller = roller;
@@ -675,7 +675,7 @@
}
/**
- * Use Hibernate directly because Roller's Query API does too much allocation.
+ * Use Hibernate directly because Weblogger's Query API does too much allocation.
*/
public WeblogTemplate getPageByLink(Weblog website, String pagelink)
throws WebloggerException {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -36,7 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
@@ -73,7 +73,7 @@
private static Log log = LogFactory.getLog(HibernateWeblogManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final HibernatePersistenceStrategy strategy;
// cached mapping of entryAnchors -> entryIds
@@ -86,7 +86,7 @@
@com.google.inject.Inject
- protected HibernateWeblogManagerImpl(Roller roller, HibernatePersistenceStrategy strat) {
+ protected HibernateWeblogManagerImpl(Weblogger roller, HibernatePersistenceStrategy strat) {
log.debug("Instantiating Hibernate Weblog Manager");
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java Tue Jun 26 22:33:26 2007
@@ -24,7 +24,7 @@
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileManagerImpl;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
@@ -44,13 +44,13 @@
/**
- * Guice module for configuring Hibernate as Roller-backend.
+ * Guice module for configuring Hibernate as Weblogger-backend.
*/
public class RollerModule implements Module {
public void configure(Binder binder) {
- binder.bind(Roller.class).to(HibernateRollerImpl.class);
+ binder.bind(Weblogger.class).to(HibernateRollerImpl.class);
binder.bind(HibernatePersistenceStrategy.class);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -35,7 +35,7 @@
import java.util.List;
import javax.persistence.Query;
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
/*
* JPAAutoPingManagerImpl.java
@@ -46,7 +46,7 @@
@com.google.inject.Singleton
public class JPAAutoPingManagerImpl implements AutoPingManager {
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -61,7 +61,7 @@
* Creates a new instance of JPAAutoPingManagerImpl
*/
@com.google.inject.Inject
- protected JPAAutoPingManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPAAutoPingManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
this.roller = roller;
this.strategy = strategy;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -46,7 +46,7 @@
@com.google.inject.Singleton
public class JPABookmarkManagerImpl implements BookmarkManager {
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -60,7 +60,7 @@
* Creates a new instance of JPABookmarkManagerImpl
*/
@com.google.inject.Inject
- protected JPABookmarkManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPABookmarkManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
log.debug("Instantiating JPA Bookmark Manager");
this.roller = roller;
this.strategy = strategy;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.pojos.AutoPing;
@@ -46,7 +46,7 @@
JPAPingQueueManagerImpl.class);
/** The strategy for this manager. */
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -54,7 +54,7 @@
* Creates a new instance of JPAPingQueueManagerImpl
*/
@com.google.inject.Inject
- protected JPAPingQueueManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPAPingQueueManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
this.roller = roller;
this.strategy = strategy;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -31,7 +31,7 @@
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.PingTarget;
@@ -50,12 +50,12 @@
private static Log log = LogFactory.getLog(
JPAPingTargetManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@com.google.inject.Inject
- protected JPAPingTargetManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPAPingTargetManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
this.roller = roller;
this.strategy = strategy;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -36,7 +36,7 @@
import org.apache.roller.weblogger.config.runtime.PropertyDef;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
/*
@@ -52,7 +52,7 @@
private static Log log = LogFactory.getLog(
JPAPropertiesManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -60,7 +60,7 @@
* Creates a new instance of JPAPropertiesManagerImpl
*/
@com.google.inject.Inject
- protected JPAPropertiesManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPAPropertiesManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
log.debug("Instantiating JPA Properties Manager");
this.roller = roller;
this.strategy = strategy;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.referrers.RefererManager;
@@ -63,7 +63,7 @@
Collections.reverseOrder(StatCountCountComparator.getInstance());
/** The strategy for this manager. */
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -71,7 +71,7 @@
* Creates a new instance of JPARefererManagerImpl
*/
@com.google.inject.Inject
- protected JPARefererManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPARefererManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
log.debug("Instantiating JPA Referer Manager");
this.roller = roller;
this.strategy = strategy;
@@ -486,7 +486,7 @@
// Launch thread to extract referer linkback
try {
- Roller mRoller = roller;
+ Weblogger mRoller = roller;
mRoller.getThreadManager().executeInBackground(
new LinkbackExtractorRunnable(ref));
} catch (InterruptedException e) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java Tue Jun 26 22:33:26 2007
@@ -23,7 +23,7 @@
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerImpl;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -38,7 +38,7 @@
import org.apache.roller.weblogger.business.themes.ThemeManager;
/**
- * A JPA specific implementation of the Roller business layer.
+ * A JPA specific implementation of the Weblogger business layer.
*/
@com.google.inject.Singleton
public class JPARollerImpl extends RollerImpl {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.runnable.ThreadManagerImpl;
import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.pojos.TaskLock;
@@ -43,12 +43,12 @@
private static final Log log = LogFactory.getLog(JPAThreadManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@com.google.inject.Inject
- protected JPAThreadManagerImpl(Roller roller, JPAPersistenceStrategy strat) {
+ protected JPAThreadManagerImpl(Weblogger roller, JPAPersistenceStrategy strat) {
super();
log.debug("Instantiating JPA Thread Manager");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -44,7 +44,7 @@
import java.util.Comparator;
import javax.persistence.Query;
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
/*
* JPAUserManagerImpl.java
@@ -61,7 +61,7 @@
private static final Comparator statCountCountReverseComparator =
Collections.reverseOrder(StatCountCountComparator.getInstance());
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
// cached mapping of weblogHandles -> weblogIds
@@ -72,7 +72,7 @@
@com.google.inject.Inject
- protected JPAUserManagerImpl(Roller roller, JPAPersistenceStrategy strat) {
+ protected JPAUserManagerImpl(Weblogger roller, JPAPersistenceStrategy strat) {
log.debug("Instantiating JPA User Manager");
this.roller = roller;
this.strategy = strat;
@@ -870,7 +870,7 @@
}
/**
- * Use JPA directly because Roller's Query API does too much allocation.
+ * Use JPA directly because Weblogger's Query API does too much allocation.
*/
public WeblogTemplate getPageByLink(Weblog website, String pagelink)
throws WebloggerException {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -40,7 +40,7 @@
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
@@ -71,7 +71,7 @@
protected static Log log = LogFactory.getLog(
JPAWeblogManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
// cached mapping of entryAnchors -> entryIds
@@ -90,7 +90,7 @@
@com.google.inject.Inject
- protected JPAWeblogManagerImpl(Roller roller, JPAPersistenceStrategy strategy) {
+ protected JPAWeblogManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
log.debug("Instantiating JPA Weblog Manager");
this.roller = roller;
this.strategy = strategy;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java Tue Jun 26 22:33:26 2007
@@ -24,7 +24,7 @@
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileManagerImpl;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
@@ -42,13 +42,13 @@
import org.apache.roller.weblogger.business.themes.ThemeManagerImpl;
/**
- * Guice module for configuring JPA as Roller-backend.
+ * Guice module for configuring JPA as Weblogger-backend.
*/
public class RollerModule implements Module {
public void configure(Binder binder) {
- binder.bind(Roller.class).to(JPARollerImpl.class);
+ binder.bind(Weblogger.class).to(JPARollerImpl.class);
binder.bind(JPAPersistenceStrategy.class);
binder.bind(org.apache.roller.weblogger.planet.business.jpa.JPARollerPlanetPersistenceStrategy.class);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java Tue Jun 26 22:33:26 2007
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.WebloggerException;
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.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
import org.apache.roller.weblogger.business.runnable.WorkerThread;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -58,7 +58,7 @@
private static Log mLogger = LogFactory.getLog(ReferrerQueueManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
private boolean asyncMode = false;
private int numWorkers = 1;
@@ -69,7 +69,7 @@
// private because we are a singleton
@com.google.inject.Inject
- protected ReferrerQueueManagerImpl(Roller roller) {
+ protected ReferrerQueueManagerImpl(Weblogger roller) {
mLogger.info("Instantiating Referrer Queue Manager");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java Tue Jun 26 22:33:26 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -116,7 +116,7 @@
try {
log.info("task started");
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
roller.getRefererManager().clearReferrers();
roller.flush();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java Tue Jun 26 22:33:26 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -74,7 +74,7 @@
}
// since this is a thread we have to make sure that we tidy up ourselves
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
roller.release();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -60,7 +60,7 @@
// =============================================
private IndexReader reader;
- private final Roller roller;
+ private final Weblogger roller;
static Log mLogger = LogFactory.getFactory().getInstance(
IndexManagerImpl.class);
@@ -95,7 +95,7 @@
* the path to the index directory
*/
@com.google.inject.Inject
- protected IndexManagerImpl(Roller roller) {
+ protected IndexManagerImpl(Weblogger roller) {
this.roller = roller;
// check config to see if the internal search is enabled
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java Tue Jun 26 22:33:26 2007
@@ -25,7 +25,7 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -43,14 +43,14 @@
//~ Instance fields ========================================================
private WeblogEntry data;
- private Roller roller;
+ private Weblogger roller;
//~ Constructors ===========================================================
/**
* Adds a web log entry into the index.
*/
- public AddEntryOperation(Roller roller, IndexManagerImpl mgr,WeblogEntry data) {
+ public AddEntryOperation(Weblogger roller, IndexManagerImpl mgr,WeblogEntry data) {
super(mgr);
this.roller = roller;
this.data = data;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java Tue Jun 26 22:33:26 2007
@@ -28,7 +28,7 @@
import org.apache.roller.weblogger.WebloggerException;
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.Weblogger;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -46,14 +46,14 @@
//~ Instance fields ========================================================
private WeblogEntry data;
- private Roller roller;
+ private Weblogger roller;
//~ Constructors ===========================================================
/**
* Adds a web log entry into the index.
*/
- public ReIndexEntryOperation(Roller roller, IndexManagerImpl mgr,WeblogEntry data) {
+ public ReIndexEntryOperation(Weblogger roller, IndexManagerImpl mgr,WeblogEntry data) {
super(mgr);
this.roller = roller;
this.data = data;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java Tue Jun 26 22:33:26 2007
@@ -33,7 +33,7 @@
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.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -53,7 +53,7 @@
//~ Instance fields ========================================================
private Weblog website;
- private Roller roller;
+ private Weblogger roller;
//~ Constructors ===========================================================
@@ -62,7 +62,7 @@
*
* @param website The website to rebuild the index for, or null for all users.
*/
- public RebuildWebsiteIndexOperation(Roller roller, IndexManagerImpl mgr, Weblog website) {
+ public RebuildWebsiteIndexOperation(Weblogger roller, IndexManagerImpl mgr, Weblog website) {
super(mgr);
this.roller = roller;
this.website = website;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java Tue Jun 26 22:33:26 2007
@@ -25,7 +25,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.FieldConstants;
@@ -46,11 +46,11 @@
//~ Instance fields ========================================================
private WeblogEntry data;
- private Roller roller;
+ private Weblogger roller;
//~ Constructors ===========================================================
- public RemoveEntryOperation(Roller roller, IndexManagerImpl mgr,WeblogEntry data) {
+ public RemoveEntryOperation(Weblogger roller, IndexManagerImpl mgr,WeblogEntry data) {
super(mgr);
this.roller = roller;
this.data = data;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java Tue Jun 26 22:33:26 2007
@@ -26,7 +26,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.FieldConstants;
@@ -48,7 +48,7 @@
//~ Instance fields ========================================================
private Weblog website;
- private Roller roller;
+ private Weblogger roller;
//~ Constructors ===========================================================
@@ -56,7 +56,7 @@
* Create a new operation that will recreate an index.
* @param website The website to rebuild the index for, or null for all sites.
*/
- public RemoveWebsiteIndexOperation(Roller roller, IndexManagerImpl mgr, Weblog website) {
+ public RemoveWebsiteIndexOperation(Weblogger roller, IndexManagerImpl mgr, Weblog website) {
super(mgr);
this.roller = roller;
this.website = website;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Tue Jun 26 22:33:26 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.InitializationException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.pojos.Theme;
@@ -56,7 +56,7 @@
private static Log log = LogFactory.getLog(ThemeManagerImpl.class);
- private final Roller roller;
+ private final Weblogger roller;
// directory where themes are kept
private String themeDir = null;
@@ -66,7 +66,7 @@
@com.google.inject.Inject
- protected ThemeManagerImpl(Roller roller) {
+ protected ThemeManagerImpl(Weblogger roller) {
this.roller = roller;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java Tue Jun 26 22:33:26 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.weblogger.util.Utilities;
@@ -301,12 +301,13 @@
/**
* Reset this user's password.
+ *
+ * @author Dave JWeblogger
* @param roller Roller instance to use for configuration information
* @param new1 New password
* @param new2 Confirm this matches new password
- * @author Dave Johnson
*/
- public void resetPassword(Roller roller, String new1, String new2) throws WebloggerException {
+ public void resetPassword(Weblogger roller, String new1, String new2) throws WebloggerException {
if (!new1.equals(new2)) {
throw new WebloggerException("newUser.error.mismatchedPasswords");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Tue Jun 26 22:33:26 2007
@@ -41,7 +41,7 @@
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.plugins.PluginManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.util.UUIDGenerator;
@@ -924,7 +924,7 @@
public Map getInitializedPlugins() {
if (initializedPlugins == null) {
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
PluginManager ppmgr = roller.getPagePluginManager();
initializedPlugins = ppmgr.getWeblogEntryPlugins(this);
} catch (Exception e) {
@@ -943,7 +943,7 @@
public WeblogEntry getWeblogEntry(String anchor) {
WeblogEntry entry = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
entry = wmgr.getWeblogEntryByAnchor(this, anchor);
} catch (WebloggerException e) {
@@ -977,7 +977,7 @@
public Set getWeblogCategories(String categoryPath) {
Set ret = new HashSet();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
WeblogCategory category = null;
if (categoryPath != null && !categoryPath.equals("nil")) {
@@ -1001,7 +1001,7 @@
public WeblogCategory getWeblogCategory(String categoryPath) {
WeblogCategory category = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
if (categoryPath != null && !categoryPath.equals("nil")) {
category = wmgr.getWeblogCategoryByPath(this, categoryPath);
@@ -1129,7 +1129,7 @@
public WeblogBookmarkFolder getBookmarkFolder(String folderName) {
WeblogBookmarkFolder ret = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
BookmarkManager bmgr = roller.getBookmarkManager();
if (folderName == null || folderName.equals("nil") || folderName.trim().equals("/")) {
return bmgr.getRootFolder(this);
@@ -1150,7 +1150,7 @@
public List getTodaysReferrers() {
List referers = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
RefererManager rmgr = roller.getRefererManager();
return rmgr.getTodaysReferers(this);
@@ -1169,7 +1169,7 @@
*/
public int getTodaysHits() {
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
WeblogHitCount hitCount = mgr.getHitCountByWeblog(this);
@@ -1204,7 +1204,7 @@
startDate = cal.getTime();
}
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
results = wmgr.getPopularTags(this, startDate, length);
} catch (Exception e) {
@@ -1219,7 +1219,7 @@
public long getCommentCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount(this);
} catch (WebloggerException e) {
@@ -1237,7 +1237,7 @@
public long getEntryCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount(this);
} catch (WebloggerException e) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java Tue Jun 26 22:33:26 2007
@@ -7,7 +7,7 @@
import org.acegisecurity.userdetails.UserDetailsService;
import org.acegisecurity.userdetails.UsernameNotFoundException;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.UserRole;
@@ -16,7 +16,7 @@
import org.springframework.dao.DataRetrievalFailureException;
/**
- * Acegi user details service implemented using Roller API.
+ * Acegi user details service implemented using Weblogger API.
*/
public class RollerUserDetailsService implements UserDetailsService {
@@ -25,7 +25,7 @@
User userData = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
userData = umgr.getUserByUserName(userName, Boolean.TRUE);
} catch (WebloggerException ex) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Tue Jun 26 22:33:26 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -56,9 +56,10 @@
private Weblog weblog = null;
- /**
- * Creates an un-initialized new instance, Roller calls init() to complete
- * construction.
+ /**
+ *
+ * Creates an un-initialized new instance, Weblogger calls init() to complete
+ * construction.
*/
public PageModel() {}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java Tue Jun 26 22:33:26 2007
@@ -33,7 +33,7 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.FieldConstants;
@@ -170,7 +170,7 @@
try {
TreeSet categories = new TreeSet();
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
WeblogEntry entry = null;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java Tue Jun 26 22:33:26 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.business.search.operations.SearchOperation;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -159,7 +159,7 @@
try {
TreeSet categories = new TreeSet();
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
WeblogEntry entry = null;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=551046&r1=551045&r2=551046
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Tue Jun 26 22:33:26 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -272,7 +272,7 @@
public Map getUserNameLetterMap() {
Map results = new HashMap();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
results = umgr.getUserNameLetterMap();
} catch (Exception e) {
@@ -290,7 +290,7 @@
public Map getWeblogHandleLetterMap() {
Map results = new HashMap();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
results = umgr.getWeblogHandleLetterMap();
} catch (Exception e) {
@@ -306,7 +306,7 @@
public List getUsersWeblogs(String userName) {
List results = new ArrayList();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
User user = umgr.getUserByUserName(userName);
List perms = umgr.getAllPermissions(user);
@@ -327,7 +327,7 @@
public List getWeblogsUsers(String handle) {
List results = new ArrayList();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
Weblog website = umgr.getWebsiteByHandle(handle);
List perms = umgr.getAllPermissions(website);
@@ -347,7 +347,7 @@
public UserWrapper getUser(String username) {
UserWrapper wrappedUser = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
User user = umgr.getUserByUserName(username, Boolean.TRUE);
wrappedUser = UserWrapper.wrap(user);
@@ -362,7 +362,7 @@
public WeblogWrapper getWeblog(String handle) {
WeblogWrapper wrappedWebsite = null;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
Weblog website = umgr.getWebsiteByHandle(handle);
wrappedWebsite = WeblogWrapper.wrap(website);
@@ -388,7 +388,7 @@
cal.add(Calendar.DATE, -1 * sinceDays);
Date startDate = cal.getTime();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
List weblogs = umgr.getWebsites(
null, Boolean.TRUE, Boolean.TRUE, startDate, null, 0, length);
@@ -411,7 +411,7 @@
public List getNewUsers(int sinceDays, int length) {
List results = new ArrayList();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
List users = umgr.getUsers(null, Boolean.TRUE, null, null, 0, length);
for (Iterator it = users.iterator(); it.hasNext();) {
@@ -472,7 +472,7 @@
cal.add(Calendar.DATE, -1 * sinceDays);
Date startDate = cal.getTime();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
results = umgr.getMostCommentedWebsites(
startDate, new Date(), 0, length);
@@ -498,7 +498,7 @@
cal.add(Calendar.DATE, -1 * sinceDays);
Date startDate = cal.getTime();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
results = wmgr.getMostCommentedWeblogEntries(
null, startDate, new Date(), 0, length);
@@ -516,7 +516,7 @@
public List getPinnedWeblogEntries(int length) {
List results = new ArrayList();
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
List weblogs = wmgr.getWeblogEntriesPinnedToMain(new Integer(length));
for (Iterator it = weblogs.iterator(); it.hasNext();) {
@@ -546,7 +546,7 @@
}
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
results = wmgr.getPopularTags(null, startDate, length);
} catch (Exception e) {
@@ -559,7 +559,7 @@
public long getCommentCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount();
} catch (WebloggerException e) {
@@ -572,7 +572,7 @@
public long getEntryCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount();
} catch (WebloggerException e) {
@@ -585,7 +585,7 @@
public long getWeblogCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getWeblogCount();
} catch (WebloggerException e) {
@@ -598,7 +598,7 @@
public long getUserCount() {
long count = 0;
try {
- Roller roller = RollerFactory.getRoller();
+ Weblogger roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getUserCount();
} catch (WebloggerException e) {