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/28 01:11:29 UTC
svn commit: r551378 [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: Wed Jun 27 16:11:26 2007
New Revision: 551378
URL: http://svn.apache.org/viewvc?view=rev&rev=551378
Log:
renaming RollerRuntimeConfig to WebloggerRuntimeConfig.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java
- copied, changed from r551377, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.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/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/pings/PingQueueProcessor.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.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/URLModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.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/rendering/velocity/deprecated/OldWeblogPageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.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/adminprotocol/RollerWeblogHandler.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/xmlrpc/BloggerAPIHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/apps/weblogger/web/index.jsp
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.ThemeResource;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.RollerMessages;
@@ -266,8 +266,8 @@
*/
public boolean overQuota(Weblog weblog) {
- String maxDir = RollerRuntimeConfig.getProperty("uploads.dir.maxsize");
- String maxFile = RollerRuntimeConfig.getProperty("uploads.file.maxsize");
+ String maxDir = WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize");
+ String maxFile = WebloggerRuntimeConfig.getProperty("uploads.file.maxsize");
BigDecimal maxDirSize = new BigDecimal(maxDir); // in megabytes
BigDecimal maxFileSize = new BigDecimal(maxFile); // in megabytes
@@ -300,14 +300,14 @@
RollerMessages messages) {
// first check, is uploading enabled?
- if(!RollerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
messages.addError("error.upload.disabled");
return false;
}
// second check, does upload exceed max size for file?
BigDecimal maxFileMB = new BigDecimal(
- RollerRuntimeConfig.getProperty("uploads.file.maxsize"));
+ WebloggerRuntimeConfig.getProperty("uploads.file.maxsize"));
int maxFileBytes = (int)(1024000 * maxFileMB.doubleValue());
log.debug("max allowed file size = "+maxFileBytes);
log.debug("attempted save file size = "+size);
@@ -318,7 +318,7 @@
// third check, does file cause weblog to exceed quota?
BigDecimal maxDirMB = new BigDecimal(
- RollerRuntimeConfig.getProperty("uploads.dir.maxsize"));
+ WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize"));
long maxDirBytes = (long)(1024000 * maxDirMB.doubleValue());
try {
File uploadsDir = this.getRealFile(weblog, null);
@@ -334,8 +334,8 @@
}
// fourth check, is upload type allowed?
- String allows = RollerRuntimeConfig.getProperty("uploads.types.allowed");
- String forbids = RollerRuntimeConfig.getProperty("uploads.types.forbid");
+ String allows = WebloggerRuntimeConfig.getProperty("uploads.types.allowed");
+ String forbids = WebloggerRuntimeConfig.getProperty("uploads.types.forbid");
String[] allowFiles = StringUtils.split(StringUtils.deleteWhitespace(allows), ",");
String[] forbidFiles = StringUtils.split(StringUtils.deleteWhitespace(forbids), ",");
if (!checkFileType(allowFiles, forbidFiles, path, contentType)) {
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.InitializationException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.config.runtime.ConfigDef;
import org.apache.roller.weblogger.config.runtime.DisplayGroup;
import org.apache.roller.weblogger.config.runtime.PropertyDef;
@@ -173,7 +173,7 @@
// start by getting our runtimeConfigDefs
RuntimeConfigDefs runtimeConfigDefs =
- RollerRuntimeConfig.getRuntimeConfigDefs();
+ WebloggerRuntimeConfig.getRuntimeConfigDefs();
// can't do initialization without our config defs
if(runtimeConfigDefs == null)
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -36,7 +36,7 @@
import org.hibernate.criterion.Order;
import org.hibernate.type.Type;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.pojos.WeblogReferrer;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -158,7 +158,7 @@
Session session = ((HibernatePersistenceStrategy)strategy).getSession();
Criteria criteria = session.createCriteria(WeblogReferrer.class);
- String spamwords = RollerRuntimeConfig.getProperty("spam.blacklist");
+ String spamwords = WebloggerRuntimeConfig.getProperty("spam.blacklist");
String[] blacklist = StringUtils.split(
StringUtils.deleteWhitespace(spamwords),",");
@@ -616,7 +616,7 @@
// If not a direct or search engine then search for linkback
boolean doLinkbackExtraction =
- RollerRuntimeConfig.getBooleanProperty("site.linkbacks.enabled");
+ WebloggerRuntimeConfig.getBooleanProperty("site.linkbacks.enabled");
if (doLinkbackExtraction
&& entry != null
&& !refurl.equals("direct")
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.business.InitializationException;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.config.runtime.ConfigDef;
import org.apache.roller.weblogger.config.runtime.DisplayGroup;
import org.apache.roller.weblogger.config.runtime.PropertyDef;
@@ -168,7 +168,7 @@
// start by getting our runtimeConfigDefs
RuntimeConfigDefs runtimeConfigDefs =
- RollerRuntimeConfig.getRuntimeConfigDefs();
+ WebloggerRuntimeConfig.getRuntimeConfigDefs();
// can't do initialization without our config defs
if(runtimeConfigDefs == null)
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -38,7 +38,7 @@
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogReferrer;
import org.apache.roller.weblogger.pojos.StatCount;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -109,7 +109,7 @@
* Apply ignoreWord/spam filters to all referers in system.
*/
public void applyRefererFilters() throws WebloggerException {
- String spamwords = RollerRuntimeConfig.getProperty("spam.blacklist");
+ String spamwords = WebloggerRuntimeConfig.getProperty("spam.blacklist");
String[] blacklist = StringUtils.split(
StringUtils.deleteWhitespace(spamwords),",");
if (blacklist.length == 0) return;
@@ -468,7 +468,7 @@
// If not a direct or search engine then search for linkback
boolean doLinkbackExtraction =
- RollerRuntimeConfig.getBooleanProperty(
+ WebloggerRuntimeConfig.getBooleanProperty(
"site.linkbacks.enabled");
if (doLinkbackExtraction
&& entry != null
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java Wed Jun 27 16:11:26 2007
@@ -25,7 +25,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.PingConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.PingQueueEntry;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -81,7 +81,7 @@
return;
}
- String absoluteContextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absoluteContextUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
if (absoluteContextUrl == null) {
logger.warn("WARNING: Skipping current ping queue processing round because we cannot yet determine the site's absolute context url.");
return;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java Wed Jun 27 16:11:26 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -80,7 +80,7 @@
public synchronized void init(Weblog website) throws WebloggerException {
// don't do this work if Smileys already loaded
if (SmileysPlugin.smileyPatterns.length < 1) {
- String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();
+ String baseURL = WebloggerRuntimeConfig.getAbsoluteContextURL();
Pattern[] tempP = new Pattern[SmileysPlugin.smileyDefs.size()];
String[] tempS = new String[SmileysPlugin.smileyDefs.size()];
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java Wed Jun 27 16:11:26 2007
@@ -34,9 +34,10 @@
// business package on the presentation package.
/**
- * Thin wrapper around WebloggerConfig and RollerRuntimeConfig for centralizing access to the many configurable
+ * Thin wrapper around WebloggerConfig and WebloggerRuntimeConfig for centralizing access to the many configurable
* settings for pings.
*
+ *
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
*/
public class PingConfig {
@@ -169,7 +170,7 @@
* @return the configured (or default) value of the suspend ping processing setting.
*/
public static boolean getSuspendPingProcessing() {
- return RollerRuntimeConfig.getBooleanProperty(PINGS_SUSPEND_PING_PROCESSING_PROP);
+ return WebloggerRuntimeConfig.getBooleanProperty(PINGS_SUSPEND_PING_PROCESSING_PROP);
}
/**
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java (from r551377, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java?view=diff&rev=551378&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java&r1=551377&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerRuntimeConfig.java Wed Jun 27 16:11:26 2007
@@ -38,9 +38,9 @@
*
* We also provide some methods for converting to different data types.
*/
-public class RollerRuntimeConfig {
+public class WebloggerRuntimeConfig {
- private static Log log = LogFactory.getLog(RollerRuntimeConfig.class);
+ private static Log log = LogFactory.getLog(WebloggerRuntimeConfig.class);
private static String runtime_config = "/org/apache/roller/weblogger/config/runtimeConfigDefs.xml";
private static RuntimeConfigDefs configDefs = null;
@@ -51,7 +51,7 @@
// prevent instantiations
- private RollerRuntimeConfig() {}
+ private WebloggerRuntimeConfig() {}
/**
@@ -84,7 +84,7 @@
public static boolean getBooleanProperty(String name) {
// get the value first, then convert
- String value = RollerRuntimeConfig.getProperty(name);
+ String value = WebloggerRuntimeConfig.getProperty(name);
if(value == null)
return false;
@@ -99,7 +99,7 @@
public static int getIntProperty(String name) {
// get the value first, then convert
- String value = RollerRuntimeConfig.getProperty(name);
+ String value = WebloggerRuntimeConfig.getProperty(name);
if(value == null)
return -1;
@@ -122,7 +122,7 @@
// unmarshall the config defs file
try {
InputStream is =
- RollerRuntimeConfig.class.getResourceAsStream(runtime_config);
+ WebloggerRuntimeConfig.class.getResourceAsStream(runtime_config);
RuntimeConfigDefsParser parser = new RuntimeConfigDefsParser();
configDefs = parser.unmarshall(is);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java Wed Jun 27 16:11:26 2007
@@ -40,7 +40,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
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.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -62,7 +62,7 @@
FeedFetcherCache feedInfoCache)
throws PlanetException {
- String localURL = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ String localURL = WebloggerRuntimeConfig.getProperty("site.absoluteurl");
// if this is not a local url then let parent deal with it
if (StringUtils.isEmpty(localURL) || !sub.getFeedURL().startsWith(localURL)) {
@@ -99,7 +99,7 @@
// if website last update time > subsciption last update time
List entries = new ArrayList();
if (sub.getLastUpdated()==null || siteUpdated.after(sub.getLastUpdated())) {
- int entryCount = RollerRuntimeConfig.getIntProperty(
+ int entryCount = WebloggerRuntimeConfig.getIntProperty(
"site.newsfeeds.defaultEntries");
entries = blogmgr.getWeblogEntries(
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java Wed Jun 27 16:11:26 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -129,7 +129,7 @@
public void runTask() {
// make sure we have an absolute url value
- String absUrl = RollerRuntimeConfig.getProperty("site.absoluteurl");
+ String absUrl = WebloggerRuntimeConfig.getProperty("site.absoluteurl");
if(absUrl == null || absUrl.trim().length() == 0) {
log.error("ERROR: cannot sync websites with Planet Roller - "
+"absolute URL not specified in Roller Config");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java Wed Jun 27 16:11:26 2007
@@ -28,7 +28,7 @@
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetGroupData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
/**
@@ -212,7 +212,7 @@
if(getGroup() != null) {
Set<PlanetSubscriptionData> subsSet = getGroup().getSubscriptions();
- String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
// iterate over list and build display list
subs = new ArrayList();
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -38,7 +38,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.Weblogger;
@@ -763,7 +763,7 @@
*/
public boolean getCommentModerationRequired() {
return (getModerateComments().booleanValue()
- || RollerRuntimeConfig.getBooleanProperty("users.moderation.required"));
+ || WebloggerRuntimeConfig.getBooleanProperty("users.moderation.required"));
}
/** No-op */
@@ -834,7 +834,7 @@
*/
public String getURL() {
// TODO: ATLAS reconcile entry.getPermaLink() with new URLs
- String relPath = RollerRuntimeConfig.getRelativeContextURL();
+ String relPath = WebloggerRuntimeConfig.getRelativeContextURL();
return relPath + "/" + getHandle();
//return URLUtilities.getWeblogURL(this, null, false);
}
@@ -848,7 +848,7 @@
*/
public String getAbsoluteURL() {
// TODO: ATLAS reconcile entry.getPermaLink() with new URLs
- String relPath = RollerRuntimeConfig.getAbsoluteContextURL();
+ String relPath = WebloggerRuntimeConfig.getAbsoluteContextURL();
return relPath + "/" + getHandle();
//return URLUtilities.getWeblogURL(this, null, true);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Wed Jun 27 16:11:26 2007
@@ -45,7 +45,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -755,7 +755,7 @@
* @roller.wrapPojoMethod type="simple"
*/
public boolean getCommentsStillAllowed() {
- if (!RollerRuntimeConfig.getBooleanProperty("users.comments.enabled")) {
+ if (!WebloggerRuntimeConfig.getBooleanProperty("users.comments.enabled")) {
return false;
}
if (website.getAllowComments() != null && !website.getAllowComments().booleanValue()) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/InitFilter.java Wed Jun 27 16:11:26 2007
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
/**
@@ -59,8 +59,8 @@
String absPath = this.getAbsoluteUrl(request);
// set them in our config
- RollerRuntimeConfig.setAbsoluteContextURL(absPath);
- RollerRuntimeConfig.setRelativeContextURL(relPath);
+ WebloggerRuntimeConfig.setAbsoluteContextURL(absPath);
+ WebloggerRuntimeConfig.setRelativeContextURL(relPath);
log.debug("relPath = "+relPath);
log.debug("absPath = "+absPath);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java Wed Jun 27 16:11:26 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
/**
* Model which provides access to application config data like site
@@ -122,17 +122,17 @@
private String getProperty(String name) {
- return RollerRuntimeConfig.getProperty(name);
+ return WebloggerRuntimeConfig.getProperty(name);
}
private int getIntProperty(String name) {
- return RollerRuntimeConfig.getIntProperty(name);
+ return WebloggerRuntimeConfig.getIntProperty(name);
}
private boolean getBooleanProperty(String name) {
- return RollerRuntimeConfig.getBooleanProperty(name);
+ return WebloggerRuntimeConfig.getBooleanProperty(name);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Wed Jun 27 16:11:26 2007
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.CommentsPager;
@@ -42,7 +42,7 @@
private static Log log = LogFactory.getLog(FeedModel.class);
- private static int DEFAULT_ENTRIES = RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+ private static int DEFAULT_ENTRIES = WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
private WeblogFeedRequest feedRequest = null;
private Weblog weblog = null;
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -39,7 +39,7 @@
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.search.operations.SearchOperation;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryWrapper;
@@ -116,7 +116,7 @@
return;
}
- this.entryCount = RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+ this.entryCount = WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
// setup the search
IndexManager indexMgr = WebloggerFactory.getWeblogger().getIndexManager();
@@ -124,7 +124,7 @@
SearchOperation search = new SearchOperation(indexMgr);
search.setTerm(feedRequest.getTerm());
- if(RollerRuntimeConfig.isSiteWideWeblog(feedRequest.getWeblogHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(feedRequest.getWeblogHandle())) {
this.websiteSpecificSearch = false;
} else {
search.setWebsiteHandle(feedRequest.getWeblogHandle());
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=551378&r1=551377&r2=551378
==============================================================================
--- 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 Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.operations.SearchOperation;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -98,7 +98,7 @@
SearchOperation search = new SearchOperation(indexMgr);
search.setTerm(searchRequest.getQuery());
- if(RollerRuntimeConfig.isSiteWideWeblog(searchRequest.getWeblogHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(searchRequest.getWeblogHandle())) {
this.websiteSpecificSearch = false;
} else {
search.setWebsiteHandle(searchRequest.getWeblogHandle());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java Wed Jun 27 16:11:26 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -81,13 +81,13 @@
/** Relative URL of Roller, e.g. /roller */
public String getSite() {
- return RollerRuntimeConfig.getRelativeContextURL();
+ return WebloggerRuntimeConfig.getRelativeContextURL();
}
/** Absolute URL of Roller, e.g. http://localhost:8080/roller */
public String getAbsoluteSite() {
- return RollerRuntimeConfig.getAbsoluteContextURL();
+ return WebloggerRuntimeConfig.getAbsoluteContextURL();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java Wed Jun 27 16:11:26 2007
@@ -28,7 +28,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
@@ -82,7 +82,7 @@
this.tags = tags;
// make sure offset, length, and page are valid
- int maxLength = RollerRuntimeConfig.getIntProperty("site.pages.maxEntries");
+ int maxLength = WebloggerRuntimeConfig.getIntProperty("site.pages.maxEntries");
length = weblog.getEntryDisplayCount();
if(length > maxLength) {
length = maxLength;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java Wed Jun 27 16:11:26 2007
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ResourceBundle;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.LinkbackExtractor;
import org.apache.roller.weblogger.util.RollerMessages;
@@ -44,7 +44,7 @@
// linkback validation can be toggled at runtime, so check if it's enabled
// if it's disabled then just return a score of 100
- if(!RollerRuntimeConfig.getBooleanProperty("site.trackbackVerification.enabled")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("site.trackbackVerification.enabled")) {
return 100;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -281,7 +281,7 @@
try {
if(!WeblogEntryComment.SPAM.equals(comment.getStatus()) ||
- !RollerRuntimeConfig.getBooleanProperty("comments.ignoreSpam.enabled")) {
+ !WebloggerRuntimeConfig.getBooleanProperty("comments.ignoreSpam.enabled")) {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
mgr.saveComment(comment);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -101,7 +101,7 @@
}
// is this the site-wide weblog?
- isSiteWide = RollerRuntimeConfig.isSiteWideWeblog(feedRequest.getWeblogHandle());
+ isSiteWide = WebloggerRuntimeConfig.isSiteWideWeblog(feedRequest.getWeblogHandle());
} catch(Exception e) {
// invalid feed request format or weblog doesn't exist
@@ -130,7 +130,7 @@
// set content type
String accepts = request.getHeader("Accept");
String userAgent = request.getHeader("User-Agent");
- if (RollerRuntimeConfig.getBooleanProperty("site.newsfeeds.styledFeeds") &&
+ if (WebloggerRuntimeConfig.getBooleanProperty("site.newsfeeds.styledFeeds") &&
accepts != null && accepts.indexOf("*/*") != -1 &&
userAgent != null && userAgent.startsWith("Mozilla")) {
// client is a browser and feed style is enabled so we want
@@ -216,7 +216,7 @@
String pageId = null;
try {
// determine what template to render with
- if (RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if (WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
pageId = "templates/feeds/site-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
} else {
pageId = "templates/feeds/weblog-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
@@ -233,7 +233,7 @@
// Load special models for site-wide blog
- if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
String siteModels = WebloggerConfig.getProperty("rendering.siteModels");
ModelLoader.loadModels(siteModels, model, initData, true);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Wed Jun 27 16:11:26 2007
@@ -38,7 +38,7 @@
import org.apache.roller.weblogger.business.referrers.IncomingReferrer;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.StaticThemeTemplate;
@@ -151,7 +151,7 @@
}
// is this the site-wide weblog?
- isSiteWide = RollerRuntimeConfig.isSiteWideWeblog(pageRequest.getWeblogHandle());
+ isSiteWide = WebloggerRuntimeConfig.isSiteWideWeblog(pageRequest.getWeblogHandle());
} catch (Exception e) {
// some kind of error parsing the request or looking up weblog
@@ -399,7 +399,7 @@
ModelLoader.loadModels(pageModels, model, initData, true);
// Load special models for site-wide blog
- if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
String siteModels = WebloggerConfig.getProperty("rendering.siteModels");
ModelLoader.loadModels(siteModels, model, initData, true);
}
@@ -530,7 +530,7 @@
}
// if this came from site-wide frontpage then skip it
- if(RollerRuntimeConfig.isSiteWideWeblog(pageRequest.getWeblogHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(pageRequest.getWeblogHandle())) {
return false;
}
@@ -566,7 +566,7 @@
// Base page URLs, with and without www.
String basePageUrlWWW =
- RollerRuntimeConfig.getAbsoluteContextURL() + "/" + pageRequest.getWeblogHandle();
+ WebloggerRuntimeConfig.getAbsoluteContextURL() + "/" + pageRequest.getWeblogHandle();
String basePageUrl = basePageUrlWWW;
if ( basePageUrlWWW.startsWith("http://www.") ) {
// chop off the http://www.
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Wed Jun 27 16:11: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.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetData;
@@ -137,11 +137,11 @@
model.put("planet", planet);
model.put("date", new Date());
model.put("utils", new UtilitiesModel());
- model.put("absoluteSite", RollerRuntimeConfig.getAbsoluteContextURL());
- model.put("feedStyle", new Boolean(RollerRuntimeConfig.getBooleanProperty("site.newsfeeds.styledFeeds")));
+ model.put("absoluteSite", WebloggerRuntimeConfig.getAbsoluteContextURL());
+ model.put("feedStyle", new Boolean(WebloggerRuntimeConfig.getBooleanProperty("site.newsfeeds.styledFeeds")));
int numEntries =
- RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+ WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
int entryCount = numEntries;
String sCount = request.getParameter("count");
if (sCount!=null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.pojos.Theme;
import org.apache.roller.weblogger.pojos.WeblogTheme;
@@ -167,7 +167,7 @@
ModelLoader.loadModels(pageModels, model, initData, true);
// Load special models for site-wide blog
- if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
String siteModels = WebloggerConfig.getProperty("rendering.siteModels");
ModelLoader.loadModels(siteModels, model, initData, true);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java Wed Jun 27 16:11:26 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -112,7 +112,7 @@
// populate the model
HashMap model = new HashMap();
model.put("website", weblog);
- model.put("absBaseURL", RollerRuntimeConfig.getAbsoluteContextURL());
+ model.put("absBaseURL", WebloggerRuntimeConfig.getAbsoluteContextURL());
// lookup Renderer we are going to use
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -148,7 +148,7 @@
ModelLoader.loadModels(searchModels, model, initData, true);
// Load special models for site-wide blog
- if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
String siteModels = WebloggerConfig.getProperty("rendering.siteModels");
ModelLoader.loadModels(siteModels, model, initData, true);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -98,7 +98,7 @@
RollerMessages messages = new RollerMessages();
WeblogTrackbackRequest trackbackRequest = null;
- if (!RollerRuntimeConfig.getBooleanProperty("users.trackbacks.enabled")) {
+ if (!WebloggerRuntimeConfig.getBooleanProperty("users.trackbacks.enabled")) {
// TODO: i18n
error = "Trackbacks are disabled for this site";
} else {
@@ -179,7 +179,7 @@
// save, commit, send response
if(!WeblogEntryComment.SPAM.equals(comment.getStatus()) ||
- !RollerRuntimeConfig.getBooleanProperty("trackbacks.ignoreSpam.enabled")) {
+ !WebloggerRuntimeConfig.getBooleanProperty("trackbacks.ignoreSpam.enabled")) {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
mgr.saveComment(comment);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -347,7 +347,7 @@
* A bookmark has changed.
*/
public void invalidate(WeblogBookmark bookmark) {
- if(RollerRuntimeConfig.isSiteWideWeblog(bookmark.getWebsite().getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(bookmark.getWebsite().getHandle())) {
invalidate(bookmark.getWebsite());
}
}
@@ -357,7 +357,7 @@
* A folder has changed.
*/
public void invalidate(WeblogBookmarkFolder folder) {
- if(RollerRuntimeConfig.isSiteWideWeblog(folder.getWebsite().getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(folder.getWebsite().getHandle())) {
invalidate(folder.getWebsite());
}
}
@@ -367,7 +367,7 @@
* A comment has changed.
*/
public void invalidate(WeblogEntryComment comment) {
- if(RollerRuntimeConfig.isSiteWideWeblog(comment.getWeblogEntry().getWebsite().getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(comment.getWeblogEntry().getWebsite().getHandle())) {
invalidate(comment.getWeblogEntry().getWebsite());
}
}
@@ -393,7 +393,7 @@
* A category has changed.
*/
public void invalidate(WeblogCategory category) {
- if(RollerRuntimeConfig.isSiteWideWeblog(category.getWebsite().getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(category.getWebsite().getHandle())) {
invalidate(category.getWebsite());
}
}
@@ -403,7 +403,7 @@
* A weblog template has changed.
*/
public void invalidate(WeblogTemplate template) {
- if(RollerRuntimeConfig.isSiteWideWeblog(template.getWebsite().getHandle())) {
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(template.getWebsite().getHandle())) {
invalidate(template.getWebsite());
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -252,11 +252,11 @@
//}
boolean commentsEnabled =
- RollerRuntimeConfig.getBooleanProperty("users.comments.enabled");
+ WebloggerRuntimeConfig.getBooleanProperty("users.comments.enabled");
boolean trackbacksEnabled =
- RollerRuntimeConfig.getBooleanProperty("users.trackbacks.enabled");
+ WebloggerRuntimeConfig.getBooleanProperty("users.trackbacks.enabled");
boolean linkbacksEnabled =
- RollerRuntimeConfig.getBooleanProperty("site.linkbacks.enabled");
+ WebloggerRuntimeConfig.getBooleanProperty("site.linkbacks.enabled");
ctx.put("commentsEnabled", new Boolean(commentsEnabled) );
ctx.put("trackbacksEnabled", new Boolean(trackbacksEnabled) );
@@ -275,9 +275,9 @@
mLogger.debug("Loading comment values");
String escapeHtml =
- RollerRuntimeConfig.getProperty("users.comments.escapehtml");
+ WebloggerRuntimeConfig.getProperty("users.comments.escapehtml");
String autoFormat =
- RollerRuntimeConfig.getProperty("users.comments.autoformat");
+ WebloggerRuntimeConfig.getProperty("users.comments.autoformat");
ctx.put("isCommentPage", Boolean.TRUE);
ctx.put("escapeHtml", new Boolean(escapeHtml) );
ctx.put("autoformat", new Boolean(autoFormat) );
@@ -333,7 +333,7 @@
// But don't exceed installation-wide maxEntries settings
int defaultEntries =
- RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+ WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
if (entryCount < 1) entryCount = defaultEntries;
if (entryCount > defaultEntries) entryCount = defaultEntries;
ctx.put("entryCount", new Integer(entryCount));
@@ -404,16 +404,16 @@
if (website != null && !"zzz_none_zzz".equals(website.getHandle())) {
url = URLUtilities.getWeblogURL(website, locale, true);
} else {
- url= RollerRuntimeConfig.getAbsoluteContextURL();
+ url= WebloggerRuntimeConfig.getAbsoluteContextURL();
}
ctx.put("websiteURL", url);
- ctx.put("baseURL", RollerRuntimeConfig.getRelativeContextURL() );
- ctx.put("absBaseURL", RollerRuntimeConfig.getAbsoluteContextURL() );
- ctx.put("ctxPath", RollerRuntimeConfig.getRelativeContextURL() );
+ ctx.put("baseURL", WebloggerRuntimeConfig.getRelativeContextURL() );
+ ctx.put("absBaseURL", WebloggerRuntimeConfig.getAbsoluteContextURL() );
+ ctx.put("ctxPath", WebloggerRuntimeConfig.getRelativeContextURL() );
ctx.put("uploadPath", ContextLoader.figureResourcePath());
try {
- URL absUrl = new URL(RollerRuntimeConfig.getAbsoluteContextURL());
+ URL absUrl = new URL(WebloggerRuntimeConfig.getAbsoluteContextURL());
ctx.put("host", absUrl.getHost());
} catch (MalformedURLException e) {
throw new WebloggerException(e);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Wed Jun 27 16:11:26 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogReferrerWrapper;
@@ -272,10 +272,10 @@
return null;
} else if("weblogCreate".equals(path)) {
// a little hacky, but hopefully nobody is really using this anymore
- return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/entryAdd.rol?weblog="+val1;
+ return WebloggerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/entryAdd.rol?weblog="+val1;
} else if("editWebsite".equals(path)) {
// a little hacky, but hopefully nobody is really using this anymore
- return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/weblogConfig.rol?weblog="+val1;
+ return WebloggerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/weblogConfig.rol?weblog="+val1;
} else if("logout-redirect".equals(path)) {
return URLUtilities.getLogoutURL(false);
} else if("login-redirect".equals(path)) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Wed Jun 27 16:11:26 2007
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -815,7 +815,7 @@
public boolean getEmailComments() {
if (mWebsite != null) {
- boolean emailComments = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
+ boolean emailComments = WebloggerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
return (mWebsite.getEmailComments().booleanValue() && emailComments);
}
return false;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java Wed Jun 27 16:11:26 2007
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.util.URLUtilities;
@@ -163,7 +163,7 @@
// language servlet has no new equivalent, so just redirect to weblog homepage
private String figureLanguageRedirect(HttpServletRequest request) {
- String newUrl = RollerRuntimeConfig.getRelativeContextURL();
+ String newUrl = WebloggerRuntimeConfig.getRelativeContextURL();
String pathInfo = request.getPathInfo();
if(pathInfo == null) {
@@ -190,7 +190,7 @@
StringBuffer url = new StringBuffer();
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
url.append("/").append(commentsRequest.getWeblogHandle()).append("/");
if(commentsRequest.getWeblogAnchor() != null) {
@@ -209,7 +209,7 @@
// redirect to new weblog resource location
private String figureResourceRedirect(HttpServletRequest request) {
- String newUrl = RollerRuntimeConfig.getRelativeContextURL();
+ String newUrl = WebloggerRuntimeConfig.getRelativeContextURL();
String pathInfo = request.getPathInfo();
if(pathInfo == null) {
@@ -230,7 +230,7 @@
// redirect to new weblog rsd location
private String figureRsdRedirect(HttpServletRequest request) {
- String newUrl = RollerRuntimeConfig.getRelativeContextURL();
+ String newUrl = WebloggerRuntimeConfig.getRelativeContextURL();
String pathInfo = request.getPathInfo();
if(pathInfo == null) {
@@ -258,10 +258,10 @@
String weblog = feedRequest.getWeblogHandle();
if(weblog == null) {
// must be site-wide feed
- weblog = RollerRuntimeConfig.getProperty("site.frontpage.weblog.handle");
+ weblog = WebloggerRuntimeConfig.getProperty("site.frontpage.weblog.handle");
}
- String newUrl = RollerRuntimeConfig.getRelativeContextURL();
+ String newUrl = WebloggerRuntimeConfig.getRelativeContextURL();
newUrl += "/"+weblog+"/feed/entries/"+feedRequest.getFlavor();
Map params = new HashMap();
@@ -290,7 +290,7 @@
StringBuffer url = new StringBuffer();
Map params = new HashMap();
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
url.append("/").append(pageRequest.getWeblogHandle()).append("/");
if(pageRequest.getWeblogPage() != null &&
@@ -342,7 +342,7 @@
// redirect to new search servlet
private String figureSearchRedirect(HttpServletRequest request) {
- String newUrl = RollerRuntimeConfig.getRelativeContextURL();
+ String newUrl = WebloggerRuntimeConfig.getRelativeContextURL();
String pathInfo = request.getPathInfo();
if(pathInfo == null) {
@@ -381,14 +381,14 @@
// redirect to new editor UI location
private String figureEditorRedirect(HttpServletRequest request) {
- return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/";
+ return WebloggerRuntimeConfig.getRelativeContextURL()+"/roller-ui/";
}
// redirect to new admin UI location
private String figureAdminRedirect(HttpServletRequest request) {
- return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/";
+ return WebloggerRuntimeConfig.getRelativeContextURL()+"/roller-ui/";
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Wed Jun 27 16:11:26 2007
@@ -28,7 +28,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.config.runtime.ConfigDef;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
@@ -84,7 +84,7 @@
}
// set config def used to draw the view
- RuntimeConfigDefs defs = RollerRuntimeConfig.getRuntimeConfigDefs();
+ RuntimeConfigDefs defs = WebloggerRuntimeConfig.getRuntimeConfigDefs();
List<ConfigDef> configDefs = defs.getConfigDefs();
for(ConfigDef configDef : configDefs) {
if("global-properties".equals(configDef.getName())) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Wed Jun 27 16:11:26 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.business.UserManager;
@@ -122,7 +122,7 @@
getBean().getTimeZone());
// pick a weblog editor for this weblog
- String def = RollerRuntimeConfig.getProperty("users.editor.pages");
+ String def = WebloggerRuntimeConfig.getProperty("users.editor.pages");
String[] defs = Utilities.stringToStringArray(def,",");
wd.setEditorPage(defs[0]);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.ui.core.security.CustomUserRegistry;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -77,7 +77,7 @@
@SkipValidation
public String execute() {
- if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
return "disabled";
}
@@ -108,7 +108,7 @@
public String save() {
- if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
return "disabled";
}
@@ -132,7 +132,7 @@
}
// are we using email activation?
- boolean activationEnabled = RollerRuntimeConfig.getBooleanProperty(
+ boolean activationEnabled = WebloggerRuntimeConfig.getBooleanProperty(
"user.account.activation.enabled");
if (activationEnabled) {
// User account will be enabled after the activation process
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java Wed Jun 27 16:11:26 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.business.FilePathException;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.ThemeResource;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -178,7 +178,7 @@
public String upload() {
// make sure uploads are enabled
- if(!RollerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
addError("error.upload.disabled");
return execute();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Wed Jun 27 16:11:26 2007
@@ -28,7 +28,7 @@
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.themes.SharedTheme;
import org.apache.roller.weblogger.business.themes.ThemeManager;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.Theme;
import org.apache.roller.weblogger.pojos.WeblogTheme;
@@ -89,7 +89,7 @@
setImportThemeId(getActionWeblog().getTheme().getId());
}
- if(!RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
+ if(!WebloggerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
return "input-sharedonly";
} else {
return INPUT;
@@ -108,7 +108,7 @@
if(WeblogTheme.CUSTOM.equals(getThemeType())) {
// only continue if custom themes are allowed
- if(RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
+ if(WebloggerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
// do theme import if necessary
SharedTheme importTheme = null;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Wed Jun 27 16:11:26 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
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.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.core.RollerContext;
@@ -184,7 +184,7 @@
private void myValidate() {
// make sure user didn't enter an invalid entry display count
- int maxEntries = RollerRuntimeConfig.getIntProperty("site.pages.maxEntries");
+ int maxEntries = WebloggerRuntimeConfig.getIntProperty("site.pages.maxEntries");
if(getBean().getEntryDisplayCount() > maxEntries) {
addError("websiteSettings.error.entryDisplayCount");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java Wed Jun 27 16:11:26 2007
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.struts2.util.UIUtils;
@@ -101,18 +101,18 @@
public String getSiteURL() {
- return RollerRuntimeConfig.getRelativeContextURL();
+ return WebloggerRuntimeConfig.getRelativeContextURL();
}
public String getAbsoluteSiteURL() {
- return RollerRuntimeConfig.getAbsoluteContextURL();
+ return WebloggerRuntimeConfig.getAbsoluteContextURL();
}
public String getProp(String key) {
// first try static config
String value = WebloggerConfig.getProperty(key);
if(value == null) {
- value = RollerRuntimeConfig.getProperty(key);
+ value = WebloggerRuntimeConfig.getProperty(key);
}
return (value == null) ? key : value;
@@ -122,7 +122,7 @@
// first try static config
String value = WebloggerConfig.getProperty(key);
if(value == null) {
- value = RollerRuntimeConfig.getProperty(key);
+ value = WebloggerRuntimeConfig.getProperty(key);
}
return (value == null) ? false : (new Boolean(value)).booleanValue();
@@ -132,7 +132,7 @@
// first try static config
String value = WebloggerConfig.getProperty(key);
if(value == null) {
- value = RollerRuntimeConfig.getProperty(key);
+ value = WebloggerRuntimeConfig.getProperty(key);
}
return (value == null) ? 0 : (new Integer(value)).intValue();