roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r551377 [1/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...
Date Wed, 27 Jun 2007 23:05:53 GMT
Author: agilliland
Date: Wed Jun 27 16:05:49 2007
New Revision: 551377

URL: http://svn.apache.org/viewvc?view=rev&rev=551377
Log:
renaming RollerConfig to WebloggerConfig.


Added:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerConfig.java
      - copied, changed from r551362, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
Removed:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/DatabaseProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/FileManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/HitCountQueue.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/MailProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentAuthenticatorServlet.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/PreviewServlet.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/util/WeblogFeedRequest.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.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/util/cache/WeblogCacheWarmupJob.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.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/Install.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/MembersInvite.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.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/Blacklist.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/IPBanList.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/Trackback.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/DatabaseProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/DatabaseProvider.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/DatabaseProvider.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/DatabaseProvider.java Wed Jun 27 16:05:49 2007
@@ -31,20 +31,20 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.startup.StartupException;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
  * Encapsulates Roller database configuration via JDBC properties or JNDI.
- *
+ * 
  * <p>To keep the logs from filling up with DB connection errors, will only 
  * attempt to connect once.</p>
  * 
  * <p>Keeps startup exception and log so we can present useful debugging
  * information to whoever is installing Roller.</p>
- *
- *
- * <p>Reads configuration properties from RollerConfig:</p>
+ * 
+ * 
+ * <p>Reads configuration properties from WebloggerConfig:</p>
  * <pre>
  * # Specify database configuration type of 'jndi' or 'jdbc'
  * database.configurationType=jndi
@@ -84,15 +84,15 @@
     public DatabaseProvider() throws StartupException {
         
         String connectionTypeString = 
-                RollerConfig.getProperty("database.configurationType"); 
+                WebloggerConfig.getProperty("database.configurationType"); 
         if ("jdbc".equals(connectionTypeString)) {
             type = ConfigurationType.JDBC_PROPERTIES;
         }
-        jndiName =          RollerConfig.getProperty("database.jndi.name");
-        jdbcDriverClass =   RollerConfig.getProperty("database.jdbc.driverClass");
-        jdbcConnectionURL = RollerConfig.getProperty("database.jdbc.connectionURL");
-        jdbcUsername =      RollerConfig.getProperty("database.jdbc.username");
-        jdbcPassword =      RollerConfig.getProperty("database.jdbc.password");
+        jndiName =          WebloggerConfig.getProperty("database.jndi.name");
+        jdbcDriverClass =   WebloggerConfig.getProperty("database.jdbc.driverClass");
+        jdbcConnectionURL = WebloggerConfig.getProperty("database.jdbc.connectionURL");
+        jdbcUsername =      WebloggerConfig.getProperty("database.jdbc.username");
+        jdbcPassword =      WebloggerConfig.getProperty("database.jdbc.password");
         
         successMessage("SUCCESS: Got parameters. Using configuration type " + type);
 

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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -29,7 +29,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.config.RollerRuntimeConfig;
 import org.apache.roller.weblogger.pojos.ThemeResource;
 import org.apache.roller.weblogger.pojos.Weblog;
@@ -53,9 +53,9 @@
      * Create file manager.
      */
     public FileManagerImpl() {
-        String uploaddir = RollerConfig.getProperty("uploads.dir");
+        String uploaddir = WebloggerConfig.getProperty("uploads.dir");
         
-        // Note: System property expansion is now handled by RollerConfig.
+        // Note: System property expansion is now handled by WebloggerConfig.
         
         if(uploaddir == null || uploaddir.trim().length() < 1)
             uploaddir = System.getProperty("user.home") + File.separator+"roller_data"+File.separator+"uploads";
@@ -291,7 +291,7 @@
     
     
     /**
-     * Determine if file can be saved given current RollerConfig settings.
+     * Determine if file can be saved given current WebloggerConfig settings.
      */
     private boolean canSave(Weblog weblog, 
                            String path, 

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/HitCountQueue.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/HitCountQueue.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/HitCountQueue.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/HitCountQueue.java Wed Jun 27 16:05:49 2007
@@ -26,7 +26,7 @@
 import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
 import org.apache.roller.weblogger.business.runnable.HitCountProcessingJob;
 import org.apache.roller.weblogger.business.runnable.WorkerThread;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.Weblog;
 
 
@@ -60,7 +60,7 @@
     // non-instantiable because we are a singleton
     private HitCountQueue() {
         
-        String sleep = RollerConfig.getProperty("hitcount.queue.sleepTime", "180");
+        String sleep = WebloggerConfig.getProperty("hitcount.queue.sleepTime", "180");
         
         try {
             // multiply by 1000 because we expect input in seconds

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/MailProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/MailProvider.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/MailProvider.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/MailProvider.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.business.startup.StartupException;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -54,16 +54,16 @@
     
     public MailProvider() throws StartupException {
         
-        String connectionTypeString = RollerConfig.getProperty("mail.configurationType"); 
+        String connectionTypeString = WebloggerConfig.getProperty("mail.configurationType"); 
         if ("properties".equals(connectionTypeString)) {
             type = ConfigurationType.MAIL_PROPERTIES;
         }
-        jndiName =     RollerConfig.getProperty("mail.jndi.name");
-        mailHostname = RollerConfig.getProperty("mail.hostname");
-        mailUsername = RollerConfig.getProperty("mail.username");
-        mailPassword = RollerConfig.getProperty("mail.password");
+        jndiName =     WebloggerConfig.getProperty("mail.jndi.name");
+        mailHostname = WebloggerConfig.getProperty("mail.hostname");
+        mailUsername = WebloggerConfig.getProperty("mail.username");
+        mailPassword = WebloggerConfig.getProperty("mail.password");
         try {
-            mailPort = Integer.parseInt(RollerConfig.getProperty("mail.port"));
+            mailPort = Integer.parseInt(WebloggerConfig.getProperty("mail.port"));
         } catch (Throwable t) {
             log.warn("mail server port not a valid integer, ignoring");
         }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.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.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -41,7 +41,7 @@
   
     
     static {
-        String moduleClassname = RollerConfig.getProperty("guice.backend.module");
+        String moduleClassname = WebloggerConfig.getProperty("guice.backend.module");
         try {
             Class moduleClass = Class.forName(moduleClassname);
             Module module = (Module)moduleClass.newInstance();

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java Wed Jun 27 16:05:49 2007
@@ -28,7 +28,7 @@
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 /**
  * Base class for Hibernate persistence implementation.
@@ -53,13 +53,13 @@
         Configuration config = new Configuration();
         config.configure("/META-INF/weblogger-hibernate.cfg.xml");
 
-        // Add all Hibernate properties found in RollerConfig
+        // Add all Hibernate properties found in WebloggerConfig
         Properties props = new Properties();
-        Enumeration keys = RollerConfig.keys();
+        Enumeration keys = WebloggerConfig.keys();
         while (keys.hasMoreElements()) {
             String key = (String)keys.nextElement();
             if (key.startsWith("hibernate.")) {
-                String value = RollerConfig.getProperty(key);
+                String value = WebloggerConfig.getProperty(key);
                 props.setProperty(key, value);
             }
         }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -38,7 +38,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.criterion.SimpleExpression;
 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.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.BookmarkManager;
 import org.apache.roller.weblogger.business.Weblogger;
@@ -314,7 +314,7 @@
                 null );    // image
         this.strategy.store(rootCat);
         
-        String cats = RollerConfig.getProperty("newuser.categories");
+        String cats = WebloggerConfig.getProperty("newuser.categories");
         WeblogCategory firstCat = rootCat;
         if (cats != null && cats.trim().length() > 0) {
             String[] splitcats = cats.split(",");
@@ -344,7 +344,7 @@
         this.strategy.store(root);
         
         Integer zero = new Integer(0);
-        String blogroll = RollerConfig.getProperty("newuser.blogroll");
+        String blogroll = WebloggerConfig.getProperty("newuser.blogroll");
         if (blogroll != null) {
             String[] splitroll = blogroll.split(",");
             for (int i=0; i<splitroll.length; i++) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.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 javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityManager;
 import javax.persistence.FlushModeType;
@@ -70,12 +70,12 @@
         Properties emfProps = loadPropertiesFromResourceName(
            "JPAEMF.properties", getContextClassLoader());
                 
-        // Add all OpenJPA and Toplinks properties found in RollerConfig
-        Enumeration keys = RollerConfig.keys(); 
+        // Add all OpenJPA and Toplinks properties found in WebloggerConfig
+        Enumeration keys = WebloggerConfig.keys(); 
         while (keys.hasMoreElements()) {
             String key = (String)keys.nextElement();
             if (key.startsWith("openjpa.") || key.startsWith("toplink.")) {
-                String value = RollerConfig.getProperty(key);
+                String value = WebloggerConfig.getProperty(key);
                 logger.info(key + ": " + value);
                 emfProps.setProperty(key, value);
             }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.weblogger.business.WeblogManager;
 import org.apache.roller.weblogger.business.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.*;
 
 import java.util.ArrayList;
@@ -361,7 +361,7 @@
                 null );    // image
         this.strategy.store(rootCat);
         
-        String cats = RollerConfig.getProperty("newuser.categories");
+        String cats = WebloggerConfig.getProperty("newuser.categories");
         WeblogCategory firstCat = rootCat;
         if (cats != null && cats.trim().length() > 0) {
             String[] splitcats = cats.split(",");
@@ -391,7 +391,7 @@
         this.strategy.store(root);
         
         Integer zero = new Integer(0);
-        String blogroll = RollerConfig.getProperty("newuser.blogroll");
+        String blogroll = WebloggerConfig.getProperty("newuser.blogroll");
         if (blogroll != null) {
             String[] splitroll = blogroll.split(",");
             for (int i=0; i<splitroll.length; i++) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -26,7 +26,7 @@
 import java.util.Map;
 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.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.commons.lang.StringUtils;
@@ -106,7 +106,7 @@
     private void loadPagePluginClasses() {
         log.debug("Initializing page plugins");
         
-        String pluginStr = RollerConfig.getProperty("plugins.page");
+        String pluginStr = WebloggerConfig.getProperty("plugins.page");
         if (log.isDebugEnabled()) log.debug(pluginStr);
         if (pluginStr != null) {
             String[] plugins = StringUtils.stripAll(

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.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.BookmarkManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
@@ -306,7 +306,7 @@
     protected Map buildBookmarkMap(Weblog website) throws WebloggerException
     {
         Map bookmarkMap = new HashMap();
-        if (RollerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
+        if (WebloggerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
             return bookmarkMap;
         }
         if (website == null)
@@ -341,7 +341,7 @@
     private String getSetting(String propName, String defaultValue)
     {
         String fullPropName = "plugins.topictag." + propName;
-        String val = (String) RollerConfig.getProperty(fullPropName);
+        String val = (String) WebloggerConfig.getProperty(fullPropName);
         return (val != null) ? val : defaultValue;
     }
 

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -29,7 +29,7 @@
 import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
 import org.apache.roller.weblogger.business.runnable.WorkerThread;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -76,15 +76,15 @@
         this.roller = roller;
 
         // lookup config options
-        this.asyncMode = RollerConfig.getBooleanProperty("referrers.asyncProcessing.enabled");
+        this.asyncMode = WebloggerConfig.getBooleanProperty("referrers.asyncProcessing.enabled");
         
         mLogger.info("Asynchronous referrer processing = "+this.asyncMode);
         
         if(this.asyncMode) {
             
             
-            String num = RollerConfig.getProperty("referrers.queue.numWorkers");
-            String sleep = RollerConfig.getProperty("referrers.queue.sleepTime");
+            String num = WebloggerConfig.getProperty("referrers.queue.numWorkers");
+            String sleep = WebloggerConfig.getProperty("referrers.queue.sleepTime");
             
             try {
                 this.numWorkers = Integer.parseInt(num);

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.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.util.DateUtil;
 
 
@@ -101,9 +101,9 @@
     
     
     /**
-     * Get the properties from RollerConfig which pertain to this task.
-     *
-     * This extracts all properties from the RollerConfig of the type
+     * Get the properties from WebloggerConfig which pertain to this task.
+     * 
+     * This extracts all properties from the WebloggerConfig of the type
      * task.<taskname>.<prop>=value and returns them in a properties object
      * where each item is keyed by <prop>.
      */
@@ -114,18 +114,18 @@
         Properties taskProps = new Properties();
         
         String key = null;
-        Enumeration keys = RollerConfig.keys();
+        Enumeration keys = WebloggerConfig.keys();
         while(keys.hasMoreElements()) {
             key = (String) keys.nextElement();
             
             if(key.startsWith(prefix)) {
                 taskProps.setProperty(key.substring(prefix.length()), 
-                        RollerConfig.getProperty(key));
+                        WebloggerConfig.getProperty(key));
             }
         }
         
         // special addition for clientId property that applies to all tasks
-        taskProps.setProperty("clientId", RollerConfig.getProperty("tasks.clientId"));
+        taskProps.setProperty("clientId", WebloggerConfig.getProperty("tasks.clientId"));
         
         return taskProps;
     }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -28,7 +28,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.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -55,11 +55,11 @@
         Date now = new Date();
         
         // okay, first we look for what tasks have been enabled
-        String tasksStr = RollerConfig.getProperty("tasks.enabled");
+        String tasksStr = WebloggerConfig.getProperty("tasks.enabled");
         String[] tasks = StringUtils.stripAll(StringUtils.split(tasksStr, ","));
         for (int i=0; i < tasks.length; i++) {
             
-            String taskClassName = RollerConfig.getProperty("tasks."+tasks[i]+".class");
+            String taskClassName = WebloggerConfig.getProperty("tasks."+tasks[i]+".class");
             if(taskClassName != null) {
                 log.info("Initializing task: "+tasks[i]);
                 

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -44,7 +44,7 @@
 
 import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
 import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.commons.lang.StringUtils;
 
 
@@ -99,13 +99,13 @@
         this.roller = roller;
 
         // check config to see if the internal search is enabled
-        String enabled = RollerConfig.getProperty("search.enabled");
+        String enabled = WebloggerConfig.getProperty("search.enabled");
         if("false".equalsIgnoreCase(enabled))
             this.searchEnabled = false;
         
         // we also need to know what our index directory is
-        // Note: system property expansion is now handled by RollerConfig
-        String searchIndexDir = RollerConfig.getProperty("search.index.dir");
+        // Note: system property expansion is now handled by WebloggerConfig
+        String searchIndexDir = WebloggerConfig.getProperty("search.index.dir");
         this.indexDir = searchIndexDir.replace('/', File.separatorChar);
         
         // a little debugging

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Wed Jun 27 16:05:49 2007
@@ -34,7 +34,7 @@
 import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.util.Utilities;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 /**
  * This is the base class for all index operation. 
@@ -72,7 +72,7 @@
         // Actual comment content is indexed only if search.index.comments
         // is true or absent from the (static) configuration properties.
         // If false in the configuration, comments are treated as if empty.
-        boolean indexComments = RollerConfig.getBooleanProperty("search.index.comments", true);
+        boolean indexComments = WebloggerConfig.getBooleanProperty("search.index.comments", true);
 
         String commentContent = "";
         String commentEmail = "";

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java Wed Jun 27 16:05:49 2007
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.DatabaseProvider;
 import org.apache.roller.weblogger.business.MailProvider;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -182,7 +182,7 @@
         }
         
         // now we need to deal with database install/upgrade logic
-        if("manual".equals(RollerConfig.getProperty("installation.type"))) {
+        if("manual".equals(WebloggerConfig.getProperty("installation.type"))) {
             
             // if we are doing manual install then all that is needed is the
             // app handled database upgrade work, not the db scripts

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.weblogger.business.InitializationException;
 import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.Theme;
 import org.apache.roller.weblogger.pojos.ThemeResource;
 import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -71,7 +71,7 @@
         this.roller = roller;
         
         // get theme directory from config and verify it
-        this.themeDir = RollerConfig.getProperty("themes.dir");
+        this.themeDir = WebloggerConfig.getProperty("themes.dir");
         if(themeDir == null || themeDir.trim().length() < 1) {
             throw new RuntimeException("couldn't get themes directory from config");
         } else {

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=551377&r1=551376&r2=551377
==============================================================================
--- 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:05:49 2007
@@ -34,9 +34,9 @@
 // business package on the presentation package.
 
 /**
- * Thin wrapper around RollerConfig and RollerRuntimeConfig for centralizing access to the many configurable
+ * Thin wrapper around WebloggerConfig and RollerRuntimeConfig for centralizing access to the many configurable
  * settings for pings.
- *
+ * 
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class PingConfig {
@@ -183,7 +183,7 @@
      * @see org.apache.roller.weblogger.ui.core.RollerContext#contextInitialized(javax.servlet.ServletContextEvent)
      */
     public static void initializeCommonTargets() throws WebloggerException {
-        String configuredVal = RollerConfig.getProperty(PINGS_INITIAL_COMMON_TARGETS_PROP);
+        String configuredVal = WebloggerConfig.getProperty(PINGS_INITIAL_COMMON_TARGETS_PROP);
         if (configuredVal == null || configuredVal.trim().length() == 0) {
             if (logger.isDebugEnabled()) {
                 logger.debug("No (or empty) value of " + PINGS_INITIAL_COMMON_TARGETS_PROP + " present in the configuration.  Skipping initialization of commmon targets.");
@@ -222,7 +222,7 @@
      * Initialize known ping variants from the configuration.
      */
     public static void initializePingVariants() {
-        String configuredVal = RollerConfig.getProperty(PINGS_VARIANT_OPTIONS_PROP);
+        String configuredVal = WebloggerConfig.getProperty(PINGS_VARIANT_OPTIONS_PROP);
         if (configuredVal == null || configuredVal.trim().length() == 0) {
             if (logger.isDebugEnabled()) {
                 logger.debug("No (or empty) value of " + PINGS_VARIANT_OPTIONS_PROP + " present in the configuration.  Skipping initialization of ping variants.");
@@ -272,7 +272,7 @@
     }
 
 
-    // TODO: Refactor functionality below to RollerConfig?
+    // TODO: Refactor functionality below to WebloggerConfig?
 
     /**
      * Get the value of an integer configuration property.
@@ -285,7 +285,7 @@
      *         is out of the specified range.
      */
     private static int getIntegerProperty(String propName, int defaultValue, int min, int max) {
-        String configuredVal = RollerConfig.getProperty(propName);
+        String configuredVal = WebloggerConfig.getProperty(propName);
         if (configuredVal == null) {
             if (logger.isDebugEnabled()) {
                 logger.debug("PingConfig property '" + propName + "' is not present in the configuration.  Using default value: " + defaultValue);
@@ -317,7 +317,7 @@
      * @return the configured value or the default if it the configured value is not present.
      */
     private static boolean getBooleanProperty(String propName, boolean defaultValue) {
-        String configuredVal = RollerConfig.getProperty(propName);
+        String configuredVal = WebloggerConfig.getProperty(propName);
         if (configuredVal == null) {
             if (logger.isDebugEnabled()) {
                 logger.debug("PingConfig property '" + propName + "' is not present in the configuration.  Using default value: " + defaultValue);

Modified: 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/RollerRuntimeConfig.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- 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/RollerRuntimeConfig.java Wed Jun 27 16:05:49 2007
@@ -152,7 +152,7 @@
         
         try {
             InputStreamReader reader =
-                    new InputStreamReader(RollerConfig.class.getResourceAsStream(runtime_config));
+                    new InputStreamReader(WebloggerConfig.class.getResourceAsStream(runtime_config));
             StringWriter configString = new StringWriter();
             
             char[] buf = new char[8196];

Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerConfig.java (from r551362, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerConfig.java?view=diff&rev=551377&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java&r1=551362&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerConfig.java&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/WebloggerConfig.java Wed Jun 27 16:05:49 2007
@@ -31,7 +31,7 @@
 /**
  * This is the single entry point for accessing configuration properties in Roller.
  */
-public class RollerConfig {
+public class WebloggerConfig {
     
     private static String default_config = "/org/apache/roller/weblogger/config/roller.properties";
     private static String custom_config = "/roller-custom.properties";
@@ -40,7 +40,7 @@
 
     private static Properties mConfig;
 
-    private static Log log = LogFactory.getLog(RollerConfig.class);
+    private static Log log = LogFactory.getLog(WebloggerConfig.class);
     
     
     /*
@@ -53,7 +53,7 @@
 
         try {
             // we'll need this to get at our properties files in the classpath
-            Class config_class = Class.forName("org.apache.roller.weblogger.config.RollerConfig");
+            Class config_class = Class.forName("org.apache.roller.weblogger.config.WebloggerConfig");
 
             // first, lets load our default properties
             InputStream is = config_class.getResourceAsStream(default_config);
@@ -110,7 +110,7 @@
 
             // some debugging for those that want it
             if(log.isDebugEnabled()) {
-                log.debug("RollerConfig looks like this ...");
+                log.debug("WebloggerConfig looks like this ...");
 
                 String key = null;
                 Enumeration keys = mConfig.keys();
@@ -128,7 +128,7 @@
 
 
     // no, you may not instantiate this class :p
-    private RollerConfig() {}
+    private WebloggerConfig() {}
 
 
     /**
@@ -168,7 +168,7 @@
      */
     public static boolean getBooleanProperty(String name, boolean defaultValue) {
         // get the value first, then convert
-        String value = RollerConfig.getProperty(name);
+        String value = WebloggerConfig.getProperty(name);
 
         if(value == null)
             return defaultValue;
@@ -188,7 +188,7 @@
      */
     public static int getIntProperty(String name, int defaultValue) {
         // get the value first, then convert
-        String value = RollerConfig.getProperty(name);
+        String value = WebloggerConfig.getProperty(name);
 
         if (value == null)
             return defaultValue;

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties Wed Jun 27 16:05:49 2007
@@ -38,7 +38,7 @@
 #           each of you roller installations.
 #
 # properties in this file are accessed like this ...
-#    RollerConfig.getProperty("propname");
+#    WebloggerConfig.getProperty("propname");
 
 # Installation type 'auto' or 'manual'
 # - Set to 'auto' if you'd like tables to be auto-created if they are not found
@@ -84,7 +84,7 @@
 # Pluggable backend
 
 # No need to touch these two settings unless you are customizing Roller
-guice.backend.module=org.apache.roller.weblogger.business.jpa.RollerModule
+guice.backend.module=org.apache.roller.weblogger.business.jpa.JPAWebloggerModule
 
 
 #---------------------------------

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java Wed Jun 27 16:05:49 2007
@@ -28,11 +28,11 @@
 import org.apache.roller.planet.business.jpa.JPAPersistenceStrategy;
 import org.apache.roller.weblogger.business.DatabaseProvider;
 import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
- * JPA strategy for Planet, uses RollerConfig to get JPA configuration.
+ * JPA strategy for Planet, uses WebloggerConfig to get JPA configuration.
  */
 @com.google.inject.Singleton
 public class JPARollerPlanetPersistenceStrategy extends JPAPersistenceStrategy {
@@ -42,7 +42,8 @@
     
     
     /**
-     * Construct by finding using DatabaseProvider and RollerConfig.
+     * Construct by finding using DatabaseProvider and WebloggerConfig.
+     * 
      * @throws org.apache.roller.PlanetException on any error
      */
     protected JPARollerPlanetPersistenceStrategy() throws PlanetException { 
@@ -53,12 +54,12 @@
         Properties emfProps = loadPropertiesFromResourceName(
            "JPAEMF.properties", getContextClassLoader());
                 
-        // Add all OpenJPA and Toplinks properties found in RollerConfig
-        Enumeration keys = RollerConfig.keys();
+        // Add all OpenJPA and Toplinks properties found in WebloggerConfig
+        Enumeration keys = WebloggerConfig.keys();
         while (keys.hasMoreElements()) {
             String key = (String)keys.nextElement();
             if (key.startsWith("openjpa.") || key.startsWith("toplink.")) {
-                String value = RollerConfig.getProperty(key);
+                String value = WebloggerConfig.getProperty(key);
                 logger.info(key + ": " + value);
                 emfProps.setProperty(key, value);
             }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java Wed Jun 27 16:05:49 2007
@@ -28,7 +28,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 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.Weblogger;
 import org.apache.roller.util.UUIDGenerator;
 import org.apache.roller.weblogger.util.Utilities;
@@ -132,8 +132,8 @@
      */
     public void resetPassword(String newPassword) throws WebloggerException {
         
-        String encrypt = RollerConfig.getProperty("passwds.encryption.enabled");
-        String algorithm = RollerConfig.getProperty("passwds.encryption.algorithm");
+        String encrypt = WebloggerConfig.getProperty("passwds.encryption.enabled");
+        String algorithm = WebloggerConfig.getProperty("passwds.encryption.algorithm");
         if (new Boolean(encrypt).booleanValue()) {
             setPassword(Utilities.encodePassword(newPassword, algorithm));
         } else {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java Wed Jun 27 16:05:49 2007
@@ -35,7 +35,7 @@
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.BootstrapException;
 import org.apache.roller.weblogger.business.startup.StartupException;
-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.PlanetFactory;
 import org.apache.roller.planet.business.startup.PlanetStartup;
@@ -93,20 +93,20 @@
         // we leave it here for now to allow users to keep writing
         // uploads into their webapp context, but this is a bad idea
         //
-        // also, the RollerConfig.setUploadsDir() method is smart
+        // also, the WebloggerConfig.setUploadsDir() method is smart
         // enough to disregard this call unless the uploads.path
         // is set to ${webapp.context}
-        RollerConfig.setUploadsDir(ctxPath);
+        WebloggerConfig.setUploadsDir(ctxPath);
         
         // try setting the themes path to <context>/themes
         // NOTE: this should go away at some point
         // we leave it here for now to allow users to keep using
         // themes in their webapp context, but this is a bad idea
         //
-        // also, the RollerConfig.setThemesDir() method is smart
+        // also, the WebloggerConfig.setThemesDir() method is smart
         // enough to disregard this call unless the themes.dir
         // is set to ${webapp.context}
-        RollerConfig.setThemesDir(servletContext.getRealPath("/")+File.separator+"themes");
+        WebloggerConfig.setThemesDir(servletContext.getRealPath("/")+File.separator+"themes");
         
         
         // Now prepare the core services of the app so we can bootstrap
@@ -138,7 +138,7 @@
             
             // Initialize Planet if necessary
             if (WebloggerFactory.isBootstrapped()) {
-                if (RollerConfig.getBooleanProperty("planet.aggregator.enabled")) {
+                if (WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
                     
                     // Now prepare the core services of planet so we can bootstrap it
                     try {
@@ -199,9 +199,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);
@@ -227,7 +227,7 @@
                 WebApplicationContextUtils.getRequiredWebApplicationContext(context);
         
 
-        String rememberMe = RollerConfig.getProperty("rememberme.enabled");
+        String rememberMe = WebloggerConfig.getProperty("rememberme.enabled");
         boolean rememberMeEnabled = Boolean.valueOf(rememberMe).booleanValue();
         
         log.info("Remember Me enabled: " + rememberMeEnabled);
@@ -240,13 +240,13 @@
         }
         
 
-        String encryptPasswords = RollerConfig.getProperty("passwds.encryption.enabled");
+        String encryptPasswords = WebloggerConfig.getProperty("passwds.encryption.enabled");
         boolean doEncrypt = Boolean.valueOf(encryptPasswords).booleanValue();
         
         if (doEncrypt) {
             DaoAuthenticationProvider provider =
                     (DaoAuthenticationProvider) ctx.getBean("daoAuthenticationProvider");
-            String algorithm = RollerConfig.getProperty("passwds.encryption.algorithm");
+            String algorithm = WebloggerConfig.getProperty("passwds.encryption.algorithm");
             PasswordEncoder encoder = null;
             if (algorithm.equalsIgnoreCase("SHA")) {
                 encoder = new ShaPasswordEncoder();
@@ -263,7 +263,7 @@
         }
         
 
-        if (RollerConfig.getBooleanProperty("securelogin.enabled")) {
+        if (WebloggerConfig.getBooleanProperty("securelogin.enabled")) {
             AuthenticationProcessingFilterEntryPoint entryPoint =
                 (AuthenticationProcessingFilterEntryPoint)
                     ctx.getBean("authenticationProcessingFilterEntryPoint");
@@ -271,7 +271,7 @@
         }
                 
         /*
-        if (RollerConfig.getBooleanProperty("schemeenforcement.enabled")) {
+        if (WebloggerConfig.getBooleanProperty("schemeenforcement.enabled")) {
             
             ChannelProcessingFilter procfilter =
                     (ChannelProcessingFilter)ctx.getBean("channelProcessingFilter");
@@ -283,7 +283,7 @@
                     (PathBasedFilterInvocationDefinitionMap)procfilter.getFilterInvocationDefinitionSource();
             
             // add HTTPS URL path patterns to Acegi config
-            String httpsUrlsProp = RollerConfig.getProperty("schemeenforcement.https.urls");
+            String httpsUrlsProp = WebloggerConfig.getProperty("schemeenforcement.https.urls");
             if (httpsUrlsProp != null) {
                 String[] httpsUrls = StringUtils.stripAll(StringUtils.split(httpsUrlsProp, ",") );
                 for (int i=0; i<httpsUrls.length; i++) {
@@ -310,7 +310,7 @@
      * @return AutoProvision
      */
     public static AutoProvision getAutoProvision() {        
-        String clazzName = RollerConfig.getProperty("users.sso.autoProvision.className");
+        String clazzName = WebloggerConfig.getProperty("users.sso.autoProvision.className");
         
         if (null == clazzName) {
             return null;

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.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.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -80,7 +80,7 @@
                     
                     // try one time to auto-provision, only happens if user==null
                     // which means installation has SSO-enabled in security.xml
-                    if(user == null && RollerConfig.getBooleanProperty("users.sso.autoProvision.enabled")) {
+                    if(user == null && WebloggerConfig.getBooleanProperty("users.sso.autoProvision.enabled")) {
                         // provisioning enabled, get provisioner and execute
                         AutoProvision provisioner = RollerContext.getAutoProvision();
                         if(provisioner != null) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java Wed Jun 27 16:05:49 2007
@@ -32,7 +32,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**
@@ -53,7 +53,7 @@
         log.debug("Entered "+request.getRequestURI());
         
         if (!WebloggerFactory.isBootstrapped() &&
-                "auto".equals(RollerConfig.getProperty("installation.type")) &&
+                "auto".equals(WebloggerConfig.getProperty("installation.type")) &&
                 !isInstallUrl(request.getServletPath())) {
             
             // we doing an install, so forward to installer

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java Wed Jun 27 16:05:49 2007
@@ -36,7 +36,7 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 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;
 
 
 /** 
@@ -116,7 +116,7 @@
     public void init(FilterConfig config) throws ServletException {
         
         // is compression enabled?
-        if(RollerConfig.getBooleanProperty("compression.gzipResponse.enabled")) {
+        if(WebloggerConfig.getBooleanProperty("compression.gzipResponse.enabled")) {
             this.enabled = true;
             log.info("Compressed Output ENABLED");
         } else {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java Wed Jun 27 16:05:49 2007
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.planet.business.PlanetFactory;
 
 
@@ -64,7 +64,7 @@
                 WebloggerFactory.getWeblogger().release();
                 
                 // if planet is enabled then release planet backend as well
-                if (RollerConfig.getBooleanProperty("planet.aggregator.enabled")) {
+                if (WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
                     if (PlanetFactory.isBootstrapped()) {
                         PlanetFactory.getPlanet().release();
                     }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java Wed Jun 27 16:05:49 2007
@@ -37,7 +37,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;
 
 
 /**
@@ -135,16 +135,16 @@
         
         // determine if we are doing scheme enforcement
         this.schemeEnforcementEnabled = 
-                RollerConfig.getBooleanProperty("schemeenforcement.enabled");
+                WebloggerConfig.getBooleanProperty("schemeenforcement.enabled");
         this.secureLoginEnabled = 
-                RollerConfig.getBooleanProperty("securelogin.enabled");
+                WebloggerConfig.getBooleanProperty("securelogin.enabled");
         
         if(this.schemeEnforcementEnabled && this.secureLoginEnabled) {
             // gather some more properties
             String http_port = 
-                    RollerConfig.getProperty("securelogin.http.port");
+                    WebloggerConfig.getProperty("securelogin.http.port");
             String https_port = 
-                    RollerConfig.getProperty("securelogin.https.port");
+                    WebloggerConfig.getProperty("securelogin.https.port");
             
             try {
                 this.httpPort = Integer.parseInt(http_port);
@@ -156,7 +156,7 @@
             
             // finally, construct our list of allowable https urls
             String urls = 
-                    RollerConfig.getProperty("schemeenforcement.https.urls");
+                    WebloggerConfig.getProperty("schemeenforcement.https.urls");
             String[] urlsArray = urls.split(",");
             for(int i=0; i < urlsArray.length; i++)
                 this.allowedUrls.add(urlsArray[i]);

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/plugins/UIPluginManagerImpl.java Wed Jun 27 16:05:49 2007
@@ -24,7 +24,7 @@
 import java.util.Map;
 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.commons.lang.StringUtils;
 
 
@@ -89,7 +89,7 @@
         
         log.debug("Initializing entry editor plugins");
         
-        String editorStr = RollerConfig.getProperty("plugins.weblogEntryEditors");
+        String editorStr = WebloggerConfig.getProperty("plugins.weblogEntryEditors");
         if (editorStr != null) {
             
             String[] editorList = StringUtils.stripAll(StringUtils.split(editorStr, ","));
@@ -120,7 +120,7 @@
         }
         
         // make sure the default editor is defined
-        String defaultEditorId = RollerConfig.getProperty("plugins.defaultEditor");
+        String defaultEditorId = WebloggerConfig.getProperty("plugins.defaultEditor");
         if(defaultEditorId != null) {
             this.defaultEditor = (WeblogEntryEditor) this.editors.get(defaultEditorId);
         }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Wed Jun 27 16:05:49 2007
@@ -30,7 +30,7 @@
 import org.acegisecurity.userdetails.ldap.LdapUserDetails;
 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.pojos.User;
 
 /**
@@ -54,7 +54,7 @@
     private static String TIMEZONE_LDAP_PROPERTY = "users.sso.registry.ldap.attributes.timezone";
     
     public static User getUserDetailsFromAuthentication() {
-        boolean usingSSO = RollerConfig.getBooleanProperty("users.sso.enabled");
+        boolean usingSSO = WebloggerConfig.getBooleanProperty("users.sso.enabled");
         if(!usingSSO) {
             log.info("SSO is not enabled. Skipping CustomUserRegistry functionality.");
             return null;
@@ -89,9 +89,9 @@
         ud.setId(null);
         ud.setUserName(userName);
         
-        boolean storePassword = RollerConfig.getBooleanProperty("users.sso.passwords.save");
+        boolean storePassword = WebloggerConfig.getBooleanProperty("users.sso.passwords.save");
         if(!storePassword) {
-            password = RollerConfig.getProperty("users.sso.passwords.defaultValue","<unknown>");
+            password = WebloggerConfig.getProperty("users.sso.passwords.defaultValue","<unknown>");
         }
         ud.setPassword(password);
         ud.setEnabled(enabled ? Boolean.TRUE : Boolean.FALSE);
@@ -119,16 +119,16 @@
         } else if(userDetails instanceof LdapUserDetails) {
             LdapUserDetails ldapDetails = (LdapUserDetails) userDetails;
             Attributes attributes = ldapDetails.getAttributes();
-            String sname = getLdapAttribute(attributes, RollerConfig.getProperty(SNAME_LDAP_PROPERTY, DEFAULT_SNAME_LDAP_ATTRIBUTE));
-            String name = getLdapAttribute(attributes, RollerConfig.getProperty(NAME_LDAP_PROPERTY, DEFAULT_NAME_LDAP_ATTRIBUTE));
-            String email = getLdapAttribute(attributes, RollerConfig.getProperty(EMAIL_LDAP_PROPERTY, DEFAULT_EMAIL_LDAP_ATTRIBUTE));
+            String sname = getLdapAttribute(attributes, WebloggerConfig.getProperty(SNAME_LDAP_PROPERTY, DEFAULT_SNAME_LDAP_ATTRIBUTE));
+            String name = getLdapAttribute(attributes, WebloggerConfig.getProperty(NAME_LDAP_PROPERTY, DEFAULT_NAME_LDAP_ATTRIBUTE));
+            String email = getLdapAttribute(attributes, WebloggerConfig.getProperty(EMAIL_LDAP_PROPERTY, DEFAULT_EMAIL_LDAP_ATTRIBUTE));
 
             ud.setScreenName(sname);
             ud.setFullName(name);
             ud.setEmailAddress(email);
             
-            String locale = getLdapAttribute(attributes, RollerConfig.getProperty(LOCALE_LDAP_PROPERTY, DEFAULT_LOCALE_LDAP_ATTRIBUTE));
-            String timezone = getLdapAttribute(attributes, RollerConfig.getProperty(TIMEZONE_LDAP_PROPERTY, DEFAULT_TIMEZONE_LDAP_ATTRIBUTE));
+            String locale = getLdapAttribute(attributes, WebloggerConfig.getProperty(LOCALE_LDAP_PROPERTY, DEFAULT_LOCALE_LDAP_ATTRIBUTE));
+            String timezone = getLdapAttribute(attributes, WebloggerConfig.getProperty(TIMEZONE_LDAP_PROPERTY, DEFAULT_TIMEZONE_LDAP_ATTRIBUTE));
             
             if(locale != null) {
                 ud.setLocale(locale);

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java Wed Jun 27 16:05:49 2007
@@ -25,7 +25,7 @@
 import java.util.List;
 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.pojos.WeblogPermission;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
@@ -98,9 +98,9 @@
             // does this tab have an enabledProperty?
             boolean includeTab = true;
             if(configTab.getEnabledProperty() != null) {
-                includeTab = RollerConfig.getBooleanProperty(configTab.getEnabledProperty());
+                includeTab = WebloggerConfig.getBooleanProperty(configTab.getEnabledProperty());
             } else if(configTab.getDisabledProperty() != null) {
-                includeTab = ! RollerConfig.getBooleanProperty(configTab.getDisabledProperty());
+                includeTab = ! WebloggerConfig.getBooleanProperty(configTab.getDisabledProperty());
             }
             
             if(includeTab) {
@@ -135,9 +135,9 @@
                     
                     boolean includeItem = true;
                     if(configTabItem.getEnabledProperty() != null) {
-                        includeItem = RollerConfig.getBooleanProperty(configTabItem.getEnabledProperty());
+                        includeItem = WebloggerConfig.getBooleanProperty(configTabItem.getEnabledProperty());
                     } else if(configTabItem.getDisabledProperty() != null) {
-                        includeItem = ! RollerConfig.getBooleanProperty(configTabItem.getDisabledProperty());
+                        includeItem = ! WebloggerConfig.getBooleanProperty(configTabItem.getDisabledProperty());
                     }
                     
                     if(includeItem) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java Wed Jun 27 16:05:49 2007
@@ -23,7 +23,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;
 import org.apache.roller.weblogger.pojos.Template;
 
 
@@ -45,8 +45,8 @@
     
     static {
         // lookup set of renderer factories we are going to use
-        String rollerFactories = RollerConfig.getProperty("rendering.rollerRendererFactories");
-        String userFactories = RollerConfig.getProperty("rendering.userRendererFactories");
+        String rollerFactories = WebloggerConfig.getProperty("rendering.rollerRendererFactories");
+        String userFactories = WebloggerConfig.getProperty("rendering.userRendererFactories");
         
         // instantiate user defined renderer factory classes
         if(userFactories != null && userFactories.trim().length() > 0) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java Wed Jun 27 16:05:49 2007
@@ -29,7 +29,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.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.Weblog;
@@ -68,7 +68,7 @@
         
         // build roller restricted list
         String restrictList = 
-                RollerConfig.getProperty("rendering.weblogMapper.rollerProtectedUrls");
+                WebloggerConfig.getProperty("rendering.weblogMapper.rollerProtectedUrls");
         if(restrictList != null && restrictList.trim().length() > 0) {
             String[] restrict = restrictList.split(",");
             for(int i=0; i < restrict.length; i++) {
@@ -78,7 +78,7 @@
         
         // add user restricted list
         restrictList = 
-                RollerConfig.getProperty("rendering.weblogMapper.userProtectedUrls");
+                WebloggerConfig.getProperty("rendering.weblogMapper.userProtectedUrls");
         if(restrictList != null && restrictList.trim().length() > 0) {
             String[] restrict = restrictList.split(",");
             for(int i=0; i < restrict.length; i++) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java Wed Jun 27 16:05:49 2007
@@ -32,7 +32,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.RequestMapper;
 
 /**
@@ -54,8 +54,8 @@
     public void init(FilterConfig filterConfig) {
         
         // lookup set of request mappers we are going to use
-        String rollerMappers = RollerConfig.getProperty("rendering.rollerRequestMappers");
-        String userMappers = RollerConfig.getProperty("rendering.userRequestMappers");
+        String rollerMappers = WebloggerConfig.getProperty("rendering.rollerRequestMappers");
+        String userMappers = WebloggerConfig.getProperty("rendering.userRequestMappers");
         
         // instantiate user defined request mapper classes
         if(userMappers != null && userMappers.trim().length() > 0) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.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.pojos.Weblog;
 import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.weblogger.ui.rendering.velocity.deprecated.ContextLoader;
@@ -51,7 +51,7 @@
             WeblogPageRequest pageRequest) throws WebloggerException {
         
         // Only load old models if it's enabled     
-        if (RollerConfig.getBooleanProperty("rendering.legacyModels.enabled")) { 
+        if (WebloggerConfig.getBooleanProperty("rendering.legacyModels.enabled")) { 
             ContextLoader.setupContext(model, request, response, pageContext, pageRequest);            
         }
     }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Wed Jun 27 16:05:49 2007
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.ui.rendering.util.*;
 import org.apache.roller.weblogger.util.RollerMessages;
@@ -46,7 +46,7 @@
     
     /** Creates a new instance of AkismetCommentValidator */
     public AkismetCommentValidator() {
-        apikey = RollerConfig.getProperty("comment.validator.akismet.apikey");
+        apikey = WebloggerConfig.getProperty("comment.validator.akismet.apikey");
     }
 
     public String getName() {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java Wed Jun 27 16:05:49 2007
@@ -24,7 +24,7 @@
 import java.util.ResourceBundle;
 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.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.ui.rendering.servlets.CommentServlet;
 import org.apache.roller.weblogger.util.RollerMessages;
@@ -42,7 +42,7 @@
         
         // instantiate the validators that are configured
         try {
-            String vals = RollerConfig.getProperty("comment.validator.classnames");
+            String vals = WebloggerConfig.getProperty("comment.validator.classnames");
             String[] valsarray = Utilities.stringToStringArray(vals, ",");
             for(int i=0; i < valsarray.length; i++) {
                 try {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java Wed Jun 27 16:05:49 2007
@@ -21,7 +21,7 @@
 import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.util.RollerMessages;
 
@@ -34,7 +34,7 @@
     private int threshold;
         
     public ExcessLinksCommentValidator() {
-        threshold = RollerConfig.getIntProperty("comment.validator.excessLinks.threshold");
+        threshold = WebloggerConfig.getIntProperty("comment.validator.excessLinks.threshold");
     }
         
     public String getName() {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java?view=diff&rev=551377&r1=551376&r2=551377
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java Wed Jun 27 16:05:49 2007
@@ -19,7 +19,7 @@
 package org.apache.roller.weblogger.ui.rendering.plugins.comments;
 
 import java.util.ResourceBundle;
-import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.util.RollerMessages;
 
@@ -31,7 +31,7 @@
     private int threshold;
     
     public ExcessSizeCommentValidator() {
-        threshold = RollerConfig.getIntProperty("comment.validator.excessSize.threshold");
+        threshold = WebloggerConfig.getIntProperty("comment.validator.excessSize.threshold");
     }
     
     public String getName() {



Mime
View raw message