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:05:53 UTC
svn commit: r551377 [2/2] - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger:
business/ business/hibernate/ business/jpa/ business/plugins/
business/plugins/entry/ business/referrers/ business/runnable/
business/search/ business/sea...
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.java Wed Jun 27 16:05:49 2007
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentAuthenticator;
import org.apache.roller.weblogger.ui.rendering.plugins.comments.DefaultCommentAuthenticator;
@@ -78,7 +78,7 @@
// lookup the authenticator we are going to use and instantiate it
try {
- String name = RollerConfig.getProperty("comment.authenticator.classname");
+ String name = WebloggerConfig.getProperty("comment.authenticator.classname");
Class clazz = Class.forName(name);
this.authenticator = (CommentAuthenticator) clazz.newInstance();
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -86,7 +86,7 @@
// lookup the authenticator we are going to use and instantiate it
try {
- String name = RollerConfig.getProperty("comment.authenticator.classname");
+ String name = WebloggerConfig.getProperty("comment.authenticator.classname");
Class clazz = Class.forName(name);
this.authenticator = (CommentAuthenticator) clazz.newInstance();
@@ -98,18 +98,18 @@
// are we doing throttling?
- if(RollerConfig.getBooleanProperty("comment.throttle.enabled")) {
+ if(WebloggerConfig.getBooleanProperty("comment.throttle.enabled")) {
int threshold = 25;
try {
- threshold = Integer.parseInt(RollerConfig.getProperty("comment.throttle.threshold"));
+ threshold = Integer.parseInt(WebloggerConfig.getProperty("comment.throttle.threshold"));
} catch(Exception e) {
log.warn("bad input for config property comment.throttle.threshold", e);
}
int interval = 60000;
try {
- interval = Integer.parseInt(RollerConfig.getProperty("comment.throttle.interval"));
+ interval = Integer.parseInt(WebloggerConfig.getProperty("comment.throttle.interval"));
// convert from seconds to milliseconds
interval = interval * 1000;
} catch(Exception e) {
@@ -118,7 +118,7 @@
int maxEntries = 250;
try {
- maxEntries = Integer.parseInt(RollerConfig.getProperty("comment.throttle.maxentries"));
+ maxEntries = Integer.parseInt(WebloggerConfig.getProperty("comment.throttle.maxentries"));
} catch(Exception e) {
log.warn("bad input for config property comment.throttle.maxentries", e);
}
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -31,7 +31,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
import org.apache.roller.weblogger.pojos.Template;
@@ -228,13 +228,13 @@
initData.put("weblogRequest", feedRequest);
// Load models for feeds
- String feedModels = RollerConfig.getProperty("rendering.feedModels");
+ String feedModels = WebloggerConfig.getProperty("rendering.feedModels");
ModelLoader.loadModels(feedModels, model, initData, true);
// Load special models for site-wide blog
if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
- String siteModels = RollerConfig.getProperty("rendering.siteModels");
+ 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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -37,7 +37,7 @@
import org.apache.roller.weblogger.business.HitCountQueue;
import org.apache.roller.weblogger.business.referrers.IncomingReferrer;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -86,7 +86,7 @@
log.info("Initializing PageServlet");
this.excludeOwnerPages =
- RollerConfig.getBooleanProperty("cache.excludeOwnerEditPages");
+ WebloggerConfig.getBooleanProperty("cache.excludeOwnerEditPages");
// get a reference to the weblog page cache
this.weblogPageCache = WeblogPageCache.getInstance();
@@ -96,12 +96,12 @@
// see if built-in referrer processing is enabled
this.processReferrers =
- RollerConfig.getBooleanProperty("referrers.processing.enabled");
+ WebloggerConfig.getBooleanProperty("referrers.processing.enabled");
log.info("Referrer processing enabled = "+this.processReferrers);
// check for possible robot pattern
- String robotPatternStr = RollerConfig.getProperty("referrer.robotCheck.userAgentPattern");
+ String robotPatternStr = WebloggerConfig.getProperty("referrer.robotCheck.userAgentPattern");
if (robotPatternStr != null && robotPatternStr.length() > 0) {
// Parse the pattern, and store the compiled form.
try {
@@ -395,12 +395,12 @@
}
// Load models for pages
- String pageModels = RollerConfig.getProperty("rendering.pageModels");
+ String pageModels = WebloggerConfig.getProperty("rendering.pageModels");
ModelLoader.loadModels(pageModels, model, initData, true);
// Load special models for site-wide blog
if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
- String siteModels = RollerConfig.getProperty("rendering.siteModels");
+ 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/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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -31,7 +31,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.pojos.Theme;
@@ -163,12 +163,12 @@
initData.put("pageContext", pageContext);
// Load models for page previewing
- String pageModels = RollerConfig.getProperty("rendering.previewModels");
+ String pageModels = WebloggerConfig.getProperty("rendering.previewModels");
ModelLoader.loadModels(pageModels, model, initData, true);
// Load special models for site-wide blog
if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
- String siteModels = RollerConfig.getProperty("rendering.siteModels");
+ 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/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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -31,7 +31,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -144,12 +144,12 @@
initData.put("searchRequest", searchRequest);
// Load models for pages
- String searchModels = RollerConfig.getProperty("rendering.searchModels");
+ String searchModels = WebloggerConfig.getProperty("rendering.searchModels");
ModelLoader.loadModels(searchModels, model, initData, true);
// Load special models for site-wide blog
if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
- String siteModels = RollerConfig.getProperty("rendering.siteModels");
+ 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/util/WeblogFeedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java Wed Jun 27 16:05:49 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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -135,7 +135,7 @@
if(request.getParameter("tags") != null) {
this.tags = Utilities.splitStringAsTags(request.getParameter("tags"));
- int maxSize = RollerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
+ int maxSize = WebloggerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
if (this.tags.size() > maxSize)
throw new InvalidRequestException("max number of tags allowed is " + maxSize + ", "
+ request.getRequestURL());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java Wed Jun 27 16:05:49 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.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -145,7 +145,7 @@
} else if("tags".equals(this.context)) {
String tagsString = pathElements[1].replace('+', ' ');
this.tags = Utilities.splitStringAsTags(URLUtilities.decode(tagsString));
- int maxSize = RollerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
+ int maxSize = WebloggerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
if(this.tags.size() > maxSize)
throw new InvalidRequestException("max number of tags allowed is " + maxSize + ", " + request.getRequestURL());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java Wed Jun 27 16:05:49 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.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetFactory;
@@ -61,11 +61,11 @@
private PlanetCache() {
- cacheEnabled = RollerConfig.getBooleanProperty(CACHE_ID+".enabled");
+ cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
Map cacheProps = new HashMap();
cacheProps.put("id", CACHE_ID);
- Enumeration allProps = RollerConfig.keys();
+ Enumeration allProps = WebloggerConfig.keys();
String prop = null;
while(allProps.hasMoreElements()) {
prop = (String) allProps.nextElement();
@@ -73,7 +73,7 @@
// we are only interested in props for this cache
if(prop.startsWith(CACHE_ID+".")) {
cacheProps.put(prop.substring(CACHE_ID.length()+1),
- RollerConfig.getProperty(prop));
+ WebloggerConfig.getProperty(prop));
}
}
@@ -86,7 +86,7 @@
}
// lookup our timeout value
- String timeoutString = RollerConfig.getProperty("cache.planet.timeout");
+ String timeoutString = WebloggerConfig.getProperty("cache.planet.timeout");
try {
long timeoutSecs = Long.parseLong(timeoutString);
this.timeout = timeoutSecs * 1000;
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -29,7 +29,7 @@
import java.util.TreeSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
@@ -74,11 +74,11 @@
private SiteWideCache() {
- cacheEnabled = RollerConfig.getBooleanProperty(CACHE_ID+".enabled");
+ cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
Map cacheProps = new HashMap();
cacheProps.put("id", CACHE_ID);
- Enumeration allProps = RollerConfig.keys();
+ Enumeration allProps = WebloggerConfig.keys();
String prop = null;
while(allProps.hasMoreElements()) {
prop = (String) allProps.nextElement();
@@ -86,7 +86,7 @@
// we are only interested in props for this cache
if(prop.startsWith(CACHE_ID+".")) {
cacheProps.put(prop.substring(CACHE_ID.length()+1),
- RollerConfig.getProperty(prop));
+ WebloggerConfig.getProperty(prop));
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java Wed Jun 27 16:05:49 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.runnable.Job;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.StaticTemplate;
@@ -128,7 +128,7 @@
initData.put("weblogRequest", feedRequest);
// Load models for feeds
- String feedModels = RollerConfig.getProperty("rendering.feedModels");
+ String feedModels = WebloggerConfig.getProperty("rendering.feedModels");
ModelLoader.loadModels(feedModels, model, initData, true);
// TODO: re-enable custom models when they are actually used
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java Wed Jun 27 16:05:49 2007
@@ -27,7 +27,7 @@
import java.util.TreeSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.rendering.util.WeblogFeedRequest;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.roller.weblogger.util.cache.Cache;
@@ -56,11 +56,11 @@
private WeblogFeedCache() {
- cacheEnabled = RollerConfig.getBooleanProperty(CACHE_ID+".enabled");
+ cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
Map cacheProps = new HashMap();
cacheProps.put("id", CACHE_ID);
- Enumeration allProps = RollerConfig.keys();
+ Enumeration allProps = WebloggerConfig.keys();
String prop = null;
while(allProps.hasMoreElements()) {
prop = (String) allProps.nextElement();
@@ -68,7 +68,7 @@
// we are only interested in props for this cache
if(prop.startsWith(CACHE_ID+".")) {
cacheProps.put(prop.substring(CACHE_ID.length()+1),
- RollerConfig.getProperty(prop));
+ WebloggerConfig.getProperty(prop));
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java Wed Jun 27 16:05:49 2007
@@ -28,7 +28,7 @@
import java.util.TreeSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.roller.weblogger.util.cache.Cache;
@@ -57,11 +57,11 @@
private WeblogPageCache() {
- cacheEnabled = RollerConfig.getBooleanProperty(CACHE_ID+".enabled");
+ cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
Map cacheProps = new HashMap();
cacheProps.put("id", CACHE_ID);
- Enumeration allProps = RollerConfig.keys();
+ Enumeration allProps = WebloggerConfig.keys();
String prop = null;
while(allProps.hasMoreElements()) {
prop = (String) allProps.nextElement();
@@ -69,7 +69,7 @@
// we are only interested in props for this cache
if(prop.startsWith(CACHE_ID+".")) {
cacheProps.put(prop.substring(CACHE_ID.length()+1),
- RollerConfig.getProperty(prop));
+ WebloggerConfig.getProperty(prop));
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java Wed Jun 27 16:05:49 2007
@@ -22,7 +22,7 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.core.RollerContext;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
@@ -58,9 +58,9 @@
velocityProps.load(instream);
// need to dynamically add old macro libraries if they are enabled
- if(RollerConfig.getBooleanProperty("rendering.legacyModels.enabled")) {
+ if(WebloggerConfig.getBooleanProperty("rendering.legacyModels.enabled")) {
String macroLibraries = (String) velocityProps.get("velocimacro.library");
- String oldLibraries = RollerConfig.getProperty("velocity.oldMacroLibraries");
+ String oldLibraries = WebloggerConfig.getProperty("velocity.oldMacroLibraries");
// set the new value
velocityProps.setProperty("velocimacro.library", oldLibraries+","+macroLibraries);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java Wed Jun 27 16:05:49 2007
@@ -26,7 +26,7 @@
import java.net.URLConnection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.util.LRUCache2;
@@ -55,9 +55,9 @@
/** Constructor */
private NewsfeedCache() {
// lookup the props we need
- String enabled = RollerConfig.getProperty("aggregator.enabled");
- String usecache = RollerConfig.getProperty("aggregator.cache.enabled");
- String cachetime = RollerConfig.getProperty("aggregator.cache.timeout");
+ String enabled = WebloggerConfig.getProperty("aggregator.enabled");
+ String usecache = WebloggerConfig.getProperty("aggregator.cache.enabled");
+ String cachetime = WebloggerConfig.getProperty("aggregator.cache.timeout");
if("true".equalsIgnoreCase(enabled))
this.aggregator_enabled = true;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Wed Jun 27 16:05:49 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.ui.struts2.core.Register;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -123,7 +123,7 @@
// TODO: replace with struts2 validation
private void myValidate() {
- String allowed = RollerConfig.getProperty("username.allowedChars");
+ String allowed = WebloggerConfig.getProperty("username.allowedChars");
if(allowed == null || allowed.trim().length() == 0) {
allowed = Register.DEFAULT_ALLOWED_CHARS;
}
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -63,7 +63,7 @@
User user = getAuthenticatedUser();
try {
- if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
+ if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
List permissions = mgr.getAllPermissions(user);
if (permissions.size() > 0) {
@@ -91,7 +91,7 @@
User user = getAuthenticatedUser();
try {
- if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
+ if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
List permissions = mgr.getAllPermissions(user);
if (permissions.size() > 0) {
@@ -151,7 +151,7 @@
public void myValidate() {
- String allowed = RollerConfig.getProperty("username.allowedChars");
+ String allowed = WebloggerConfig.getProperty("username.allowedChars");
if(allowed == null || allowed.trim().length() == 0) {
allowed = Register.DEFAULT_ALLOWED_CHARS;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java Wed Jun 27 16:05:49 2007
@@ -28,7 +28,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.startup.StartupException;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.springframework.beans.factory.access.BootstrapException;
@@ -176,7 +176,7 @@
public String getProp(String key) {
// Static config only, we don't have database yet
- String value = RollerConfig.getProperty(key);
+ String value = WebloggerConfig.getProperty(key);
return (value == null) ? key : value;
}
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.ui.core.security.CustomUserRegistry;
@@ -88,7 +88,7 @@
try {
// Let's see if there's any user-authentication available from Acegi
// and retrieve custom user data to pre-populate form.
- boolean usingSSO = RollerConfig.getBooleanProperty("users.sso.enabled");
+ boolean usingSSO = WebloggerConfig.getBooleanProperty("users.sso.enabled");
if(usingSSO) {
User fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
if(fromSSO != null) {
@@ -242,12 +242,12 @@
// if usingSSO, we don't want to error on empty password/username from HTML form.
setFromSS0(false);
- boolean usingSSO = RollerConfig.getBooleanProperty("users.sso.enabled");
+ boolean usingSSO = WebloggerConfig.getBooleanProperty("users.sso.enabled");
if(usingSSO) {
- boolean storePassword = RollerConfig.getBooleanProperty("users.sso.passwords.saveInRollerDb");
+ boolean storePassword = WebloggerConfig.getBooleanProperty("users.sso.passwords.saveInRollerDb");
User fromSSO = CustomUserRegistry.getUserDetailsFromAuthentication();
if(fromSSO != null) {
- String password = RollerConfig.getProperty("users.sso.passwords.defaultValue", "<unknown>");
+ String password = WebloggerConfig.getProperty("users.sso.passwords.defaultValue", "<unknown>");
if(storePassword) {
password = fromSSO.getPassword();
}
@@ -258,7 +258,7 @@
}
}
- String allowed = RollerConfig.getProperty("username.allowedChars");
+ String allowed = WebloggerConfig.getProperty("username.allowedChars");
if(allowed == null || allowed.trim().length() == 0) {
allowed = DEFAULT_ALLOWED_CHARS;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Wed Jun 27 16:05:49 2007
@@ -21,7 +21,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -62,7 +62,7 @@
public String execute() {
// if group blogging is disabled then you can't change permissions
- if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
+ if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
// TODO: i18n
addError("invitations disabled");
return SUCCESS;
@@ -80,7 +80,7 @@
public String save() {
// if group blogging is disabled then you can't change permissions
- if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
+ if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
// TODO: i18n
addError("invitations disabled");
return SUCCESS;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Wed Jun 27 16:05:49 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -179,7 +179,7 @@
public List getTemplateLanguages() {
- String langs = RollerConfig.getProperty("rendering.templateLanguages","velocity");
+ String langs = WebloggerConfig.getProperty("rendering.templateLanguages","velocity");
String[] langsArray = Utilities.stringToStringArray(langs, ",");
return Arrays.asList(langsArray);
}
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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -23,7 +23,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -110,7 +110,7 @@
public String getProp(String key) {
// first try static config
- String value = RollerConfig.getProperty(key);
+ String value = WebloggerConfig.getProperty(key);
if(value == null) {
value = RollerRuntimeConfig.getProperty(key);
}
@@ -120,7 +120,7 @@
public boolean getBooleanProp(String key) {
// first try static config
- String value = RollerConfig.getProperty(key);
+ String value = WebloggerConfig.getProperty(key);
if(value == null) {
value = RollerRuntimeConfig.getProperty(key);
}
@@ -130,7 +130,7 @@
public int getIntProp(String key) {
// first try static config
- String value = RollerConfig.getProperty(key);
+ String value = WebloggerConfig.getProperty(key);
if(value == null) {
value = RollerRuntimeConfig.getProperty(key);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java Wed Jun 27 16:05:49 2007
@@ -40,7 +40,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.commons.lang.StringUtils;
/**
@@ -152,7 +152,7 @@
// save the new blacklist
InputStream instream = connection.getInputStream();
- String uploadDir = RollerConfig.getProperty("uploads.dir");
+ String uploadDir = WebloggerConfig.getProperty("uploads.dir");
String path = uploadDir + File.separator + blacklistFile;
FileOutputStream outstream = new FileOutputStream(path);
@@ -194,7 +194,7 @@
try {
String path = blacklistFilePath;
if (path == null) {
- String uploadDir = RollerConfig.getProperty("uploads.dir");
+ String uploadDir = WebloggerConfig.getProperty("uploads.dir");
path = uploadDir + File.separator + blacklistFile;
}
File blacklistFile = new File(path);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java Wed Jun 27 16:05:49 2007
@@ -23,7 +23,7 @@
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -41,7 +41,7 @@
* @return True if comment matches blacklist term
*/
public static boolean checkComment(WeblogEntryComment comment) {
- if (RollerConfig.getBooleanProperty("site.blacklist.enable.comments")) {
+ if (WebloggerConfig.getBooleanProperty("site.blacklist.enable.comments")) {
return testComment(comment);
}
return false;
@@ -52,7 +52,7 @@
* @return True if comment matches blacklist term
*/
public static boolean checkTrackback(WeblogEntryComment comment) {
- if (RollerConfig.getBooleanProperty("site.blacklist.enable.trackbacks")) {
+ if (WebloggerConfig.getBooleanProperty("site.blacklist.enable.trackbacks")) {
return testComment(comment);
}
return false;
@@ -63,7 +63,7 @@
* @return True if comment matches blacklist term
*/
public static boolean checkReferrer(Weblog website, String referrerURL) {
- if (RollerConfig.getBooleanProperty("site.blacklist.enable.referrers")) {
+ if (WebloggerConfig.getBooleanProperty("site.blacklist.enable.referrers")) {
List stringRules = new ArrayList();
List regexRules = new ArrayList();
Blacklist.populateSpamRules(
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/IPBanList.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/IPBanList.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/IPBanList.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/IPBanList.java Wed Jun 27 16:05:49 2007
@@ -26,7 +26,7 @@
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
/**
@@ -61,7 +61,7 @@
log.debug("INIT");
// load up set of denied ips
- String banIpsFilePath = RollerConfig.getProperty("ipbanlist.file");
+ String banIpsFilePath = WebloggerConfig.getProperty("ipbanlist.file");
if(banIpsFilePath != null) {
ModifiedFile banIpsFile = new ModifiedFile(banIpsFilePath);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Wed Jun 27 16:05:49 2007
@@ -43,7 +43,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -275,7 +275,7 @@
log.debug("Comment notification enabled ... preparing email");
// Determine message and addressing options from init parameters
- boolean hideCommenterAddrs = RollerConfig.getBooleanProperty(
+ boolean hideCommenterAddrs = WebloggerConfig.getBooleanProperty(
"comment.notification.hideCommenterAddresses");
// use either the weblog configured from address or the site configured from address
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java Wed Jun 27 16:05:49 2007
@@ -35,7 +35,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.jdom.Document;
import org.jdom.Element;
@@ -59,7 +59,7 @@
// Make sure trackback to URL is allowed
boolean allowTrackback = true;
- String allowedURLs = RollerConfig.getProperty("trackback.allowedURLs");
+ String allowedURLs = WebloggerConfig.getProperty("trackback.allowedURLs");
if (!StringUtils.isEmpty(allowedURLs)) {
// in the case that the administrator has enabled trackbacks
// for only specific URLs, set it to false by default
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java Wed Jun 27 16:05:49 2007
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
import org.apache.roller.weblogger.business.runnable.Job;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
@@ -75,7 +75,7 @@
static {
// lookup what cache factory we want to use
- String classname = RollerConfig.getProperty("cache.defaultFactory");
+ String classname = WebloggerConfig.getProperty("cache.defaultFactory");
// use reflection to instantiate our factory class
try {
@@ -104,7 +104,7 @@
// add custom handlers
- String customHandlers = RollerConfig.getProperty("cache.customHandlers");
+ String customHandlers = WebloggerConfig.getProperty("cache.customHandlers");
if(customHandlers != null && customHandlers.trim().length() > 0) {
String[] cHandlers = customHandlers.split(",");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Wed Jun 27 16:05:49 2007
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
@@ -100,7 +100,7 @@
/** Get a Handler object implementation based on the given request. */
public static Handler getHandler(HttpServletRequest req) throws HandlerException {
- boolean enabled = RollerConfig.getBooleanProperty("webservices.adminprotocol.enabled");
+ boolean enabled = WebloggerConfig.getBooleanProperty("webservices.adminprotocol.enabled");
if (!enabled) {
throw new NotAllowedException("ERROR: Admin protocol not enabled");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java Wed Jun 27 16:05:49 2007
@@ -46,7 +46,7 @@
import java.io.BufferedReader;
import java.io.StringWriter;
import org.jdom.Namespace;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
/**
* Atom Servlet implements Atom by calling a Roller independent handler.
@@ -68,7 +68,7 @@
private AtomHandler createAtomRequestHandler(HttpServletRequest request)
throws ServletException {
log.debug("Creating Atom handler");
- boolean enabled = RollerConfig.getBooleanProperty(
+ boolean enabled = WebloggerConfig.getBooleanProperty(
"webservices.atomprotocol.enabled");
if (!enabled) {
throw new ServletException("ERROR: Atom protocol not enabled");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Wed Jun 27 16:05:49 2007
@@ -60,7 +60,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileIOException;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManager;
@@ -946,11 +946,11 @@
if (enabled) {
// are passwords encrypted?
String encrypted =
- RollerConfig.getProperty("passwds.encryption.enabled");
+ WebloggerConfig.getProperty("passwds.encryption.enabled");
password = userPass.substring(p+1);
if ("true".equalsIgnoreCase(encrypted)) {
password = Utilities.encodePassword(password,
- RollerConfig.getProperty("passwds.encryption.algorithm"));
+ WebloggerConfig.getProperty("passwds.encryption.algorithm"));
}
valid = user.getPassword().equals(password);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java Wed Jun 27 16:05:49 2007
@@ -31,7 +31,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.TagStat;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -46,7 +46,7 @@
public class TagStatsServlet extends HttpServlet {
// this allows for -1 for no limits.
- private final int MAX_LENGTH = RollerConfig.getIntProperty("services.json.tags.max", 100);
+ private final int MAX_LENGTH = WebloggerConfig.getIntProperty("services.json.tags.max", 100);
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doGet(request, response);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java Wed Jun 27 16:05:49 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -129,11 +129,11 @@
if (user != null) {
// are passwords encrypted
String encrypted =
- RollerConfig.getProperty("passwds.encryption.enabled");
+ WebloggerConfig.getProperty("passwds.encryption.enabled");
//System.out.print("password was [" + password + "] ");
if ("true".equalsIgnoreCase(encrypted)) {
password = Utilities.encodePassword(password,
- RollerConfig.getProperty("passwds.encryption.algorithm"));
+ WebloggerConfig.getProperty("passwds.encryption.algorithm"));
}
authenticated = password.equals(user.getPassword());
}
@@ -184,11 +184,11 @@
if (enabled) {
// are passwords encrypted?
String encrypted =
- RollerConfig.getProperty("passwds.encryption.enabled");
+ WebloggerConfig.getProperty("passwds.encryption.enabled");
//System.out.print("password was [" + password + "] ");
if ("true".equalsIgnoreCase(encrypted)) {
password = Utilities.encodePassword(password,
- RollerConfig.getProperty("passwds.encryption.algorithm"));
+ WebloggerConfig.getProperty("passwds.encryption.algorithm"));
}
//System.out.println("is now [" + password + "]");
authenticated = user.getPassword().equals(password);