You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/06/19 03:22:12 UTC
svn commit: r548542 - in /roller/trunk/apps/weblogger: ./
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/config/
src/java/org/apache/roller/weblogger/ui/core/
src/java/org/apache/roller/weblogger/ui/core/filters/ sr...
Author: snoopdave
Date: Mon Jun 18 18:22:09 2007
New Revision: 548542
URL: http://svn.apache.org/viewvc?view=rev&rev=548542
Log:
Moving comment authenticator and validators into their own package
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/AkismetCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/BlacklistCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentAuthenticator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidationManager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/DefaultCommentAuthenticator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/DefaultCommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessLinksCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessSizeCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/MathCommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
- copied, changed from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/TrackbackLinkbackCommentValidator.java
Removed:
roller/trunk/apps/weblogger/scratch.txt
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/AkismetCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/BlacklistCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidationManager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/DefaultCommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessLinksCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessSizeCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/MathCommentAuthenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/TrackbackLinkbackCommentValidator.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
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/filters/BootstrapFilter.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/TrackbackServlet.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java?view=diff&rev=548542&r1=548541&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java Mon Jun 18 18:22:09 2007
@@ -38,6 +38,7 @@
//"org.apache.roller.weblogger.business.datamapper.jpa.JPARollerImpl";
private static Roller rollerInstance = null;
+ private static boolean bootstrapped = false;
// non-instantiable
@@ -47,6 +48,14 @@
/**
+ * True if bootstrap process was completed
+ */
+ public static boolean isBootstrapped() {
+ return bootstrapped;
+ }
+
+
+ /**
* Bootstrap the Roller Weblogger business tier.
*/
public static final void bootstrap() {
@@ -87,6 +96,8 @@
} catch (WebloggerException e) {
log.error("ERROR configing ping managers", e);
}
+
+ bootstrapped = true;
}
@@ -144,5 +155,5 @@
return rollerInstance;
}
-
+
}
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=548542&r1=548541&r2=548542
==============================================================================
--- 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 Mon Jun 18 18:22:09 2007
@@ -371,7 +371,7 @@
#----------------------------------
# comment authentication
-comment.authenticator.classname=org.apache.roller.weblogger.ui.rendering.util.MathCommentAuthenticator
+comment.authenticator.classname=org.apache.roller.weblogger.ui.rendering.plugins.comments.MathCommentAuthenticator
#----------------------------------
# comment notification
@@ -390,10 +390,10 @@
# comment validation
comment.validator.classnames=\
-org.apache.roller.weblogger.ui.rendering.util.BlacklistCommentValidator,\
-org.apache.roller.weblogger.ui.rendering.util.ExcessLinksCommentValidator,\
-org.apache.roller.weblogger.ui.rendering.util.ExcessSizeCommentValidator
-#org.apache.roller.weblogger.ui.rendering.util.AkismetCommentValidator
+org.apache.roller.weblogger.ui.rendering.plugins.comments.BlacklistCommentValidator,\
+org.apache.roller.weblogger.ui.rendering.plugins.comments.ExcessLinksCommentValidator,\
+org.apache.roller.weblogger.ui.rendering.plugins.comments.ExcessSizeCommentValidator
+#org.apache.roller.weblogger.ui.rendering.plugins.comments.AkismetCommentValidator
comment.validator.excessLinks.threshold=3
comment.validator.excessSize.threshold=1000
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=548542&r1=548541&r2=548542
==============================================================================
--- 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 Mon Jun 18 18:22:09 2007
@@ -20,8 +20,6 @@
import java.io.File;
import java.io.InputStream;
-import java.sql.Connection;
-import java.util.Date;
import java.util.Properties;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -32,20 +30,13 @@
import org.acegisecurity.providers.encoding.PasswordEncoder;
import org.acegisecurity.providers.encoding.ShaPasswordEncoder;
import org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint;
-import org.acegisecurity.userdetails.jdbc.JdbcDaoImpl;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.DatabaseProvider;
-import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.business.utils.DatabaseScriptProvider;
import org.apache.roller.weblogger.business.utils.DatabaseUpgrader;
-import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.config.RollerConfig;
-import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.runnable.ThreadManager;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager;
@@ -54,8 +45,6 @@
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.velocity.runtime.RuntimeSingleton;
import org.springframework.context.ApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.support.WebApplicationContextUtils;
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=548542&r1=548541&r2=548542
==============================================================================
--- 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 Mon Jun 18 18:22:09 2007
@@ -33,6 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.DatabaseProvider;
+import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.utils.DatabaseCreator;
import org.apache.roller.weblogger.business.utils.DatabaseUpgrader;
@@ -57,51 +58,23 @@
log.debug("Entered "+request.getRequestURI());
- if ("auto".equals(RollerConfig.getProperty("installation.type"))) {
-
+ if ("auto".equals(RollerConfig.getProperty("installation.type"))) {
// an auto-install is in progress, do some checks and if necessary
// redirect to error, db create or db upgrade page
// only do this if Roller is configured for auto-install and
- // only if request is NOT for install page or a style/script file
-
+ // only if request is NOT for install page or a style/script file
String requestURI = request.getRequestURI();
if ( requestURI != null
&& !requestURI.startsWith("/roller/roller-ui/install")
&& !requestURI.endsWith(".js")
&& !requestURI.endsWith(".css")) {
-
- // if cannot connect to database
- try {
- DatabaseProvider dp = DatabaseProvider.getDatabaseProvider();
- } catch (RollerException e) {
- // we doing an install, so forward to informative database error page
+
+ if (RollerFactory.isBootstrapped()) {
+ // we doing an install, so forward to installer
RequestDispatcher rd =
- context.getRequestDispatcher("/roller-ui/install/databaseError.rol");
+ context.getRequestDispatcher("/roller-ui/install/installer.rol");
rd.forward(req, res);
- return;
- }
-
- // if installation type 'auto' then check if upgrade required
- try {
- if (DatabaseCreator.isCreationRequired()) {
- // forward to database create page
- RequestDispatcher rd = context.getRequestDispatcher(
- "/roller-ui/install/createDatabase.rol");
- rd.forward(req, res);
- return;
- }
- if (DatabaseUpgrader.isUpgradeRequired()) {
- // forward to database upgrade page
- RequestDispatcher rd = context.getRequestDispatcher(
- "/roller-ui/install/upgradeDatabase.rol");
- rd.forward(req, res);
- return;
- }
- } catch (Throwable t) {
- // Exception at this point indicates something is
- // horribly wrong and there is no way to recover.
- throw new RuntimeException("FATAL error checking database status", t);
}
}
}
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/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=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/AkismetCommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/AkismetCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -29,6 +29,7 @@
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.ui.rendering.util.*;
import org.apache.roller.weblogger.util.RollerMessages;
import org.apache.roller.weblogger.util.URLUtilities;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/BlacklistCommentValidator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/BlacklistCommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/BlacklistCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentAuthenticator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentAuthenticator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentAuthenticator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentAuthenticator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentAuthenticator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentAuthenticator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentAuthenticator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import javax.servlet.http.HttpServletRequest;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/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=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidationManager.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidationManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ArrayList;
import java.util.Iterator;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import javax.servlet.http.HttpServletRequest;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/DefaultCommentAuthenticator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/DefaultCommentAuthenticator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/DefaultCommentAuthenticator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/DefaultCommentAuthenticator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/DefaultCommentAuthenticator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/DefaultCommentAuthenticator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/DefaultCommentAuthenticator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import javax.servlet.http.HttpServletRequest;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/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=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessLinksCommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessLinksCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
import java.util.regex.Matcher;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/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=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessSizeCommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ExcessSizeCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
import org.apache.roller.weblogger.config.RollerConfig;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/MathCommentAuthenticator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/MathCommentAuthenticator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/MathCommentAuthenticator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java (from r548440, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/TrackbackLinkbackCommentValidator.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java?view=diff&rev=548542&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/TrackbackLinkbackCommentValidator.java&r1=548440&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/TrackbackLinkbackCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java Mon Jun 18 18:22:09 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.weblogger.ui.rendering.util;
+package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.io.IOException;
import java.net.MalformedURLException;
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=548542&r1=548541&r2=548542
==============================================================================
--- 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 Mon Jun 18 18:22:09 2007
@@ -28,8 +28,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.RollerConfig;
-import org.apache.roller.weblogger.ui.rendering.util.CommentAuthenticator;
-import org.apache.roller.weblogger.ui.rendering.util.DefaultCommentAuthenticator;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentAuthenticator;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.DefaultCommentAuthenticator;
/**
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=548542&r1=548541&r2=548542
==============================================================================
--- 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 Mon Jun 18 18:22:09 2007
@@ -38,9 +38,9 @@
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.rendering.util.CommentAuthenticator;
-import org.apache.roller.weblogger.ui.rendering.util.CommentValidationManager;
-import org.apache.roller.weblogger.ui.rendering.util.DefaultCommentAuthenticator;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentAuthenticator;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentValidationManager;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.DefaultCommentAuthenticator;
import org.apache.roller.weblogger.ui.rendering.util.WeblogCommentRequest;
import org.apache.roller.weblogger.ui.rendering.util.WeblogEntryCommentForm;
import org.apache.roller.weblogger.util.GenericThrottle;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=548542&r1=548541&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Mon Jun 18 18:22:09 2007
@@ -37,8 +37,8 @@
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.rendering.util.CommentValidationManager;
-import org.apache.roller.weblogger.ui.rendering.util.TrackbackLinkbackCommentValidator;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentValidationManager;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.TrackbackLinkbackCommentValidator;
import org.apache.roller.weblogger.ui.rendering.util.WeblogTrackbackRequest;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.weblogger.util.MailUtil;
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?view=diff&rev=548542&r1=548541&r2=548542
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Mon Jun 18 18:22:09 2007
@@ -25,6 +25,7 @@
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.ui.rendering.plugins.comments.CommentValidationManager;
import org.apache.roller.weblogger.util.RollerMessages;
/**