You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/24 02:31:53 UTC
svn commit: r1580686 [2/2] - in /roller/trunk/app/src:
main/java/org/apache/roller/planet/business/jpa/
main/java/org/apache/roller/planet/business/updater/
main/java/org/apache/roller/util/
main/java/org/apache/roller/weblogger/business/ main/java/org...
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Mon Mar 24 01:31:51 2014
@@ -21,6 +21,7 @@ package org.apache.roller.weblogger.ui.r
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.HitCountQueue;
import org.apache.roller.weblogger.business.WeblogEntryManager;
@@ -148,10 +149,10 @@ public class PageServlet extends HttpSer
}
}
- Weblog weblog = null;
- boolean isSiteWide = false;
+ Weblog weblog;
+ boolean isSiteWide;
- WeblogPageRequest pageRequest = null;
+ WeblogPageRequest pageRequest;
try {
pageRequest = new WeblogPageRequest(request);
@@ -194,7 +195,7 @@ public class PageServlet extends HttpSer
}
// generate cache key
- String cacheKey = null;
+ String cacheKey;
if (isSiteWide) {
cacheKey = siteWideCache.generateKey(pageRequest);
} else {
@@ -231,7 +232,7 @@ public class PageServlet extends HttpSer
if ((!this.excludeOwnerPages || !pageRequest.isLoggedIn())
&& request.getAttribute("skipCache") == null) {
- CachedContent cachedContent = null;
+ CachedContent cachedContent;
if (isSiteWide) {
cachedContent = (CachedContent) siteWideCache.get(cacheKey);
} else {
@@ -244,8 +245,7 @@ public class PageServlet extends HttpSer
// allow for hit counting
if (!isSiteWide) {
- this.processHit(weblog, request.getRequestURL().toString(),
- request.getHeader("referer"));
+ this.processHit(weblog);
}
response.setContentLength(cachedContent.getContent().length);
@@ -409,13 +409,12 @@ public class PageServlet extends HttpSer
// allow for hit counting
if (!isSiteWide) {
- this.processHit(weblog, request.getRequestURL().toString(),
- request.getHeader("referer"));
+ this.processHit(weblog);
}
// looks like we need to render content
// set the content deviceType
- String contentType = "text/html; charset=utf-8";
+ String contentType;
if (StringUtils.isNotEmpty(page.getOutputContentType())) {
contentType = page.getOutputContentType() + "; charset=utf-8";
} else {
@@ -429,17 +428,17 @@ public class PageServlet extends HttpSer
}
}
- HashMap model = new HashMap();
+ HashMap<String, Object> model = new HashMap<String, Object>();
try {
PageContext pageContext = JspFactory.getDefaultFactory()
- .getPageContext(this, request, response, "", false, 8192,
+ .getPageContext(this, request, response, "", false, RollerConstants.EIGHT_KB_IN_BYTES,
true);
// special hack for menu tag
request.setAttribute("pageRequest", pageRequest);
// populate the rendering model
- Map initData = new HashMap();
+ Map<String, Object> initData = new HashMap<String, Object>();
initData.put("requestParameters", request.getParameterMap());
initData.put("parsedRequest", pageRequest);
initData.put("pageContext", pageContext);
@@ -480,7 +479,7 @@ public class PageServlet extends HttpSer
}
// lookup Renderer we are going to use
- Renderer renderer = null;
+ Renderer renderer;
try {
log.debug("Looking up renderer");
renderer = RendererManager.getRenderer(page,
@@ -496,8 +495,8 @@ public class PageServlet extends HttpSer
return;
}
- // render content. use size of about 24K for a standard page
- CachedContent rendererOutput = new CachedContent(24567, contentType);
+ // render content
+ CachedContent rendererOutput = new CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES, contentType);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
@@ -562,7 +561,7 @@ public class PageServlet extends HttpSer
/**
* Notify the hit tracker that it has an incoming page hit.
*/
- private void processHit(Weblog weblog, String url, String referrer) {
+ private void processHit(Weblog weblog) {
HitCountQueue counter = HitCountQueue.getInstance();
counter.processHit(weblog);
@@ -623,7 +622,7 @@ public class PageServlet extends HttpSer
}
// validate the referrer
- if (pageRequest != null && pageRequest.getWeblogHandle() != null) {
+ if (pageRequest.getWeblogHandle() != null) {
// Base page URLs, with and without www.
String basePageUrlWWW = WebloggerRuntimeConfig
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Mon Mar 24 01:31:51 2014
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
@@ -202,8 +203,8 @@ public class PlanetFeedServlet extends H
return;
}
- // render content. use default size of about 24K for a standard page
- CachedContent rendererOutput = new CachedContent(24567);
+ // render content
+ CachedContent rendererOutput = new CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Mon Mar 24 01:31:51 2014
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -70,7 +71,7 @@ public class PreviewResourceServlet exte
Weblog weblog;
- WeblogPreviewResourceRequest resourceRequest = null;
+ WeblogPreviewResourceRequest resourceRequest;
try {
// parse the incoming request and extract the relevant data
resourceRequest = new WeblogPreviewResourceRequest(request);
@@ -156,11 +157,11 @@ public class PreviewResourceServlet exte
response.setContentType(this.context.getMimeType(resourceRequest
.getResourcePath()));
- OutputStream out = null;
+ OutputStream out;
try {
// ok, lets serve up the file
- byte[] buf = new byte[8192];
- int length = 0;
+ byte[] buf = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
+ int length;
out = response.getOutputStream();
while ((length = resourceStream.read(buf)) > 0) {
out.write(buf, 0, length);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Mon Mar 24 01:31:51 2014
@@ -18,6 +18,7 @@
package org.apache.roller.weblogger.ui.rendering.servlets;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.Theme;
import org.apache.roller.weblogger.pojos.WeblogTheme;
@@ -208,7 +209,7 @@ public class PreviewServlet extends Http
Map model = new HashMap();
try {
PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
- this, request, response,"", false, 8192, true);
+ this, request, response,"", false, RollerConstants.EIGHT_KB_IN_BYTES, true);
// special hack for menu tag
request.setAttribute("pageRequest", previewRequest);
@@ -261,8 +262,8 @@ public class PreviewServlet extends Http
return;
}
- // render content. use default size of about 24K for a standard page
- CachedContent rendererOutput = new CachedContent(24567);
+ // render content
+ CachedContent rendererOutput = new CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java Mon Mar 24 01:31:51 2014
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.themes.SharedTheme;
import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -108,11 +109,11 @@ public class PreviewThemeImageServlet ex
// set the content type based on whatever is in our web.xml mime defs
response.setContentType(this.context.getMimeType(previewImagePath));
- OutputStream out = null;
+ OutputStream out;
try {
// ok, lets serve up the file
- byte[] buf = new byte[8192];
- int length = 0;
+ byte[] buf = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
+ int length;
out = response.getOutputStream();
while((length = resourceStream.read(buf)) > 0) {
out.write(buf, 0, length);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java Mon Mar 24 01:31:51 2014
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
@@ -70,10 +71,9 @@ public class RSDServlet extends HttpServ
throws ServletException, IOException {
log.debug("Entering");
+ Weblog weblog;
+ WeblogRequest weblogRequest;
- Weblog weblog = null;
-
- WeblogRequest weblogRequest = null;
try {
weblogRequest = new WeblogRequest(request);
@@ -109,12 +109,12 @@ public class RSDServlet extends HttpServ
response.setContentType("application/rsd+xml; charset=utf-8");
// populate the model
- HashMap model = new HashMap();
+ HashMap<String, Object> model = new HashMap<String, Object>();
model.put("website", weblog);
model.put("absBaseURL", WebloggerRuntimeConfig.getAbsoluteContextURL());
// lookup Renderer we are going to use
- Renderer renderer = null;
+ Renderer renderer;
try {
log.debug("Looking up renderer");
Template template = new StaticTemplate("weblog/rsd.vm", "velocity");
@@ -132,7 +132,7 @@ public class RSDServlet extends HttpServ
}
// render content
- CachedContent rendererOutput = new CachedContent(4096);
+ CachedContent rendererOutput = new CachedContent(RollerConstants.FOUR_KB_IN_BYTES);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java Mon Mar 24 01:31:51 2014
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -68,12 +69,12 @@ public class ResourceServlet extends Htt
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- Weblog weblog = null;
+ Weblog weblog;
//String ctx = request.getContextPath();
//String servlet = request.getServletPath();
//String reqURI = request.getRequestURI();
- WeblogResourceRequest resourceRequest = null;
+ WeblogResourceRequest resourceRequest;
try {
// parse the incoming request and extract the relevant data
resourceRequest = new WeblogResourceRequest(request);
@@ -155,11 +156,11 @@ public class ResourceServlet extends Htt
response.setContentType(this.context.getMimeType(resourceRequest
.getResourcePath()));
- OutputStream out = null;
+ OutputStream out;
try {
// ok, lets serve up the file
- byte[] buf = new byte[8192];
- int length = 0;
+ byte[] buf = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
+ int length;
out = response.getOutputStream();
while ((length = resourceStream.read(buf)) > 0) {
out.write(buf, 0, length);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Mon Mar 24 01:31:51 2014
@@ -32,6 +32,7 @@ import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -178,7 +179,7 @@ public class SearchServlet extends HttpS
Map model = new HashMap();
try {
PageContext pageContext = JspFactory.getDefaultFactory()
- .getPageContext(this, request, response, "", false, 8192,
+ .getPageContext(this, request, response, "", false, RollerConstants.EIGHT_KB_IN_BYTES,
true);
// populate the rendering model
@@ -254,7 +255,7 @@ public class SearchServlet extends HttpS
}
// render content
- CachedContent rendererOutput = new CachedContent(4096);
+ CachedContent rendererOutput = new CachedContent(RollerConstants.FOUR_KB_IN_BYTES);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java Mon Mar 24 01:31:51 2014
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.ui.rendering.mobile.MobileDeviceRepository;
@@ -65,7 +66,7 @@ public class ModDateHeaderUtil {
HttpServletResponse response, long lastModifiedTimeMillis,
MobileDeviceRepository.DeviceType deviceType) {
- long sinceDate = 0;
+ long sinceDate;
try {
sinceDate = request.getDateHeader("If-Modified-Since");
} catch (IllegalArgumentException ex) {
@@ -75,7 +76,7 @@ public class ModDateHeaderUtil {
}
// truncate to seconds
- lastModifiedTimeMillis -= (lastModifiedTimeMillis % 1000);
+ lastModifiedTimeMillis -= (lastModifiedTimeMillis % RollerConstants.SEC_IN_MS);
if (log.isDebugEnabled()) {
SimpleDateFormat dateFormat = new SimpleDateFormat(
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java Mon Mar 24 01:31:51 2014
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.rendering.util.PlanetRequest;
import org.apache.roller.weblogger.util.cache.Cache;
@@ -48,7 +49,7 @@ public final class PlanetCache {
// keep a cached version of last expired time
private ExpiringCacheEntry lastUpdateTime = null;
- private long timeout = 15 * 60 * 1000;
+ private long timeout = 15 * RollerConstants.MIN_IN_MS;
// reference to our singleton instance
private static PlanetCache singletonInstance = new PlanetCache();
@@ -83,7 +84,7 @@ public final class PlanetCache {
String timeoutString = WebloggerConfig.getProperty("cache.planet.timeout");
try {
long timeoutSecs = Long.parseLong(timeoutString);
- this.timeout = timeoutSecs * 1000;
+ this.timeout = timeoutSecs * RollerConstants.SEC_IN_MS;
} catch(Exception e) {
// ignored ... illegal value
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.util.cache.Cache;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -97,7 +98,7 @@ public class SaltCache {
public void put(String key, Object value) {
// expire after 60 minutes
- contentCache.put(key, new ExpiringCacheEntry(value, 60 * 60 * 1000));
+ contentCache.put(key, new ExpiringCacheEntry(value, 60 * RollerConstants.MIN_IN_MS));
log.debug("PUT "+key);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java Mon Mar 24 01:31:51 2014
@@ -28,6 +28,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
@@ -65,7 +66,7 @@ public class SiteWideCache implements Ca
// keep a cached version of last expired time
private ExpiringCacheEntry lastUpdateTime = null;
- private long timeout = 15 * 60 * 1000;
+ private long timeout = 15 * 60 * RollerConstants.SEC_IN_MS;
// reference to our singleton instance
private static SiteWideCache singletonInstance = new SiteWideCache();
@@ -75,7 +76,7 @@ public class SiteWideCache implements Ca
cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
- Map cacheProps = new HashMap();
+ Map<String, String> cacheProps = new HashMap<String, String>();
cacheProps.put("id", CACHE_ID);
Enumeration allProps = WebloggerConfig.keys();
String prop = null;
@@ -196,7 +197,7 @@ public class SiteWideCache implements Ca
StringBuilder key = new StringBuilder();
- key.append(this.CACHE_ID).append(":");
+ key.append(CACHE_ID).append(":");
key.append("page/");
key.append(pageRequest.getWeblogHandle());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.runnable.Job;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
@@ -49,7 +50,7 @@ public class WeblogCacheWarmupJob implem
private static Log log = LogFactory.getLog(WeblogCacheWarmupJob.class);
// inputs from the user
- private Map inputs = null;
+ private Map<String, Object> inputs = null;
public void execute() {
@@ -60,18 +61,18 @@ public class WeblogCacheWarmupJob implem
if(inputs != null) {
// what weblogs will we handle?
- List weblogs = (List) inputs.get("weblogs");
+ List<String> weblogs = (List<String>) inputs.get("weblogs");
if(weblogs == null) {
return;
}
// should we do rss entries feeds?
- if("true".equals((String) inputs.get("feed-entries-rss"))) {
+ if("true".equals(inputs.get("feed-entries-rss"))) {
this.warmupFeedCache(weblogs, "entries", "rss");
}
// should we do atom entries feeds?
- if("true".equals((String) inputs.get("feed-entries-atom"))) {
+ if("true".equals(inputs.get("feed-entries-atom"))) {
this.warmupFeedCache(weblogs, "entries", "atom");
}
}
@@ -80,12 +81,12 @@ public class WeblogCacheWarmupJob implem
}
- public Map output() {
+ public Map<String, Object> output() {
return null;
}
- public void input(Map input) {
+ public void input(Map<String, Object> input) {
this.inputs = input;
}
@@ -112,8 +113,8 @@ public class WeblogCacheWarmupJob implem
// populate the rendering model
- Map model = new HashMap();
- Map initData = new HashMap();
+ Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, WeblogFeedRequest> initData = new HashMap<String, WeblogFeedRequest>();
initData.put("request", null);
initData.put("feedRequest", feedRequest);
initData.put("weblogRequest", feedRequest);
@@ -128,14 +129,14 @@ public class WeblogCacheWarmupJob implem
// lookup Renderer we are going to use
- Renderer renderer = null;
+ Renderer renderer;
Template template = new StaticTemplate(
"weblog-"+type+"-"+format+".vm", "velocity");
renderer = RendererManager.getRenderer(template, DeviceType.standard);
// render content. use default size of about 24K for a standard page
- CachedContent rendererOutput = new CachedContent(24567);
+ CachedContent rendererOutput = new CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES);
renderer.render(model, rendererOutput.getCachedWriter());
@@ -154,7 +155,7 @@ public class WeblogCacheWarmupJob implem
}
long end = System.currentTimeMillis();
- long time = (end-start)*1000;
+ long time = (end-start) * RollerConstants.SEC_IN_MS;
log.info("Completed warmup for "+type+"/"+format+" in "+time+" secs.");
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java Mon Mar 24 01:31:51 2014
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.ui.rendering.Renderer;
@@ -177,7 +178,7 @@ public class VelocityRenderer implements
}
long endTime = System.currentTimeMillis();
- long renderTime = (endTime - startTime) / 1000;
+ long renderTime = (endTime - startTime) / RollerConstants.SEC_IN_MS;
log.debug("Rendered [" + renderTemplate.getId() + "] in "
+ renderTime + " secs");
@@ -191,9 +192,6 @@ public class VelocityRenderer implements
// need to lookup parse error template
renderException(model, out, "error-parse.vm");
- // and we're done
- return;
-
} catch (MethodInvocationException ex) {
// in the case of a parsing error including a page we want to render
@@ -203,9 +201,6 @@ public class VelocityRenderer implements
// need to lookup parse error template
renderException(model, out, "error-parse.vm");
- // and we're done
- return;
-
} catch (VelocityException ex) {
// in the case of a parsing error including a macro we want to
@@ -215,9 +210,6 @@ public class VelocityRenderer implements
// need to lookup parse error template
renderException(model, out, "error-parse.vm");
- // and we're done
- return;
-
} catch (Exception ex) {
// wrap and rethrow so caller can deal with it
throw new RenderingException("Error during rendering", ex);
@@ -257,9 +249,6 @@ public class VelocityRenderer implements
// render output to Writer
velocityTemplate.merge(ctx, out);
- // and we're done
- return;
-
} catch (Exception e) {
// wrap and rethrow so caller can deal with it
throw new RenderingException("Error during rendering", e);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java Mon Mar 24 01:31:51 2014
@@ -28,6 +28,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -93,9 +94,9 @@ public final class BookmarksImport exten
stream = new FileInputStream(getOpmlFile());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buffer = new byte[8192];
+ byte[] buffer = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
int bytesRead = 0;
- while ((bytesRead=stream.read(buffer,0,8192)) != -1) {
+ while ((bytesRead=stream.read(buffer,0,RollerConstants.EIGHT_KB_IN_BYTES)) != -1) {
baos.write(buffer, 0, bytesRead);
}
String data = new String(baos.toByteArray());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Mon Mar 24 01:31:51 2014
@@ -83,13 +83,11 @@ public abstract class EntryBase extends
List<WeblogEntry> entries = Collections.emptyList();
try {
entries = WebloggerFactory.getWeblogger().getWeblogEntryManager()
- .getWeblogEntries(
-
- getActionWeblog(), // userName
+ .getWeblogEntries(getActionWeblog(),
null, null, // startDate
null, // endDate
null, // catName
- null, WeblogEntry.PUBLISHED, // status
+ null, WeblogEntry.PUBLISHED,
null, // text
null, // sortby (null for pubTime)
null, null, 0, 20);
@@ -109,13 +107,11 @@ public abstract class EntryBase extends
List<WeblogEntry> entries = Collections.emptyList();
try {
entries = WebloggerFactory.getWeblogger().getWeblogEntryManager()
- .getWeblogEntries(
-
- getActionWeblog(), // userName
+ .getWeblogEntries(getActionWeblog(),
null, null, // startDate
null, // endDate
null, // catName
- null, WeblogEntry.SCHEDULED, // status
+ null, WeblogEntry.SCHEDULED,
null, // text
null, // sortby (null for pubTime)
null, null, 0, 20);
@@ -135,14 +131,12 @@ public abstract class EntryBase extends
List<WeblogEntry> entries = Collections.emptyList();
try {
entries = WebloggerFactory.getWeblogger().getWeblogEntryManager()
- .getWeblogEntries(
-
- getActionWeblog(), null, null, // startDate
+ .getWeblogEntries(getActionWeblog(), null, null,
null, // endDate
null, // catName
- null, WeblogEntry.DRAFT, // status
+ null, WeblogEntry.DRAFT,
null, // text
- "updateTime", // sortby
+ "updateTime",
null, null, 0, 20); // maxEntries
} catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
@@ -160,14 +154,12 @@ public abstract class EntryBase extends
List<WeblogEntry> entries = Collections.emptyList();
try {
entries = WebloggerFactory.getWeblogger().getWeblogEntryManager()
- .getWeblogEntries(
-
- getActionWeblog(), null, null, // startDate
+ .getWeblogEntries(getActionWeblog(), null, null,
null, // endDate
null, // catName
- null, WeblogEntry.PENDING, // status
+ null, WeblogEntry.PENDING,
null, // text
- "updateTime", // sortby
+ "updateTime",
null, null, 0, 20);
} catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java Mon Mar 24 01:31:51 2014
@@ -116,9 +116,9 @@ public class MediaFileSearchBean {
return tags;
}
- public void setTags(String tags) {
+ /* public void setTags(String tags) {
this.tags = tags;
- }
+ } */
public int getPageNum() {
return pageNum;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Mon Mar 24 01:31:51 2014
@@ -50,7 +50,6 @@ public class Templates extends UIAction
// name and action of new template if we are adding a template
private String newTmplName = null;
private String newTmplAction = null;
- private String type = null;
public Templates() {
this.actionName = "templates";
@@ -86,7 +85,7 @@ public class Templates extends UIAction
setTemplates(pages);
// build list of action types that may be added
- List availableActions = new ArrayList();
+ List<String> availableActions = new ArrayList<String>();
availableActions.add(WeblogTemplate.ACTION_CUSTOM);
if (WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme())) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java Mon Mar 24 01:31:51 2014
@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletRes
// import org.apache.abdera.model.Feed;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.URLStrategy;
@@ -80,8 +81,6 @@ public final class WeblogExport extends
private static final SimpleDateFormat MT_DATE_FORMAT =
new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
- private static final SimpleDateFormat ATOM_ID_DATE_FORMAT =
- new SimpleDateFormat("yyyy-MM-dd");
private static final String MT_FORMAT = "mtimport";
private static final String MT_PLUS_FORMAT = "mtimportplus";
@@ -154,7 +153,6 @@ public final class WeblogExport extends
options.put(MT_FORMAT, getText("weblogExport.format.mtimport"));
options.put(MT_PLUS_FORMAT, getText("weblogExport.format.mtimportplus"));
- // options.put(ATOM_FORMAT, getText("weblogExport.format.atom"));
return options;
}
@@ -309,7 +307,7 @@ public final class WeblogExport extends
// Create a buffer for reading the files
byte[] buffer;
- buffer = new byte[1024];
+ buffer = new byte[RollerConstants.ONE_KB_IN_BYTES];
ServletOutputStream servletOutput;
servletOutput = response.getOutputStream();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java Mon Mar 24 01:31:51 2014
@@ -39,6 +39,8 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.commons.lang3.StringUtils;
import org.apache.roller.util.DateUtil;
@@ -91,11 +93,6 @@ public class Blacklist {
return blacklist;
}
- /** Updated MT blacklist if necessary. */
- public static void checkForUpdate() {
- getBlacklist().update();
- }
-
/** Non-Static update method. */
public void update() {
if (BLACKLIST_URL != null) {
@@ -160,7 +157,7 @@ public class Blacklist {
mLogger.debug("writing updated MT blacklist to "+path);
// read from url and write to file
- byte[] buf = new byte[4096];
+ byte[] buf = new byte[RollerConstants.FOUR_KB_IN_BYTES];
int length;
while((length = instream.read(buf)) > 0) {
outstream.write(buf, 0, length);
@@ -357,10 +354,7 @@ public class Blacklist {
*/
public static boolean matchesRulesOnly(
String str, List<String> stringRules, List<Pattern> regexRules) {
- if (testStringRules(str, stringRules)) {
- return true;
- }
- return testRegExRules(str, regexRules);
+ return testStringRules(str, stringRules) || testRegExRules(str, regexRules);
}
/** Test String against the RegularExpression rules. */
@@ -459,9 +453,8 @@ public class Blacklist {
/** Return pretty list of String and RegEx rules. */
public String toString() {
- StringBuilder buf = new StringBuilder("blacklist ");
- buf.append(blacklistStr).append("\n");
- buf.append("Regex blacklist ").append(blacklistRegex);
- return buf.toString();
+ String val = "blacklist " + blacklistStr;
+ val += "\nRegex blacklist " + blacklistRegex;
+ return val;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java Mon Mar 24 01:31:51 2014
@@ -34,7 +34,12 @@ import org.apache.roller.weblogger.pojos
public class BlacklistChecker {
private static Log mLogger = LogFactory.getLog(BlacklistChecker.class);
- /**
+ private BlacklistChecker() {
+ // never instantiable
+ throw new AssertionError();
+ }
+
+ /**
* Test comment, applying all blacklists, if configured
* @return True if comment matches blacklist term
*/
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java Mon Mar 24 01:31:51 2014
@@ -54,15 +54,22 @@ public class HTMLSanitizer {
public static Pattern forbiddenTags = Pattern.compile("^(script|object|embed|link|style|form|input)$");
public static Pattern allowedTags = Pattern.compile("^(b|p|i|s|a|img|table|thead|tbody|tfoot|tr|th|td|dd|dl|dt|em|h1|h2|h3|h4|h5|h6|li|ul|ol|span|div|strike|strong|"
+ "sub|sup|pre|del|code|blockquote|strike|kbd|br|hr|area|map|object|embed|param|link|form|small|big)$");
- private static Pattern commentPattern = Pattern.compile("<!--.*"); // <!--.........>
- private static Pattern tagStartPattern = Pattern.compile("<(?i)(\\w+\\b)\\s*(.*)/?>$"); // <tag ....props.....>
- private static Pattern tagClosePattern = Pattern.compile("</(?i)(\\w+\\b)\\s*>$"); // </tag .........>
+ // <!--.........>
+ private static Pattern commentPattern = Pattern.compile("<!--.*");
+ // <tag ....props.....>
+ private static Pattern tagStartPattern = Pattern.compile("<(?i)(\\w+\\b)\\s*(.*)/?>$");
+ // </tag .........>
+ private static Pattern tagClosePattern = Pattern.compile("</(?i)(\\w+\\b)\\s*>$");
private static Pattern standAloneTags = Pattern.compile("^(img|br|hr)$");
private static Pattern selfClosed = Pattern.compile("<.+/>");
- private static Pattern attributesPattern = Pattern.compile("(\\w*)\\s*=\\s*\"([^\"]*)\""); // prop="...."
- private static Pattern stylePattern = Pattern.compile("([^\\s^:]+)\\s*:\\s*([^;]+);?"); // color:red;
- private static Pattern urlStylePattern = Pattern.compile("(?i).*\\b\\s*url\\s*\\(['\"]([^)]*)['\"]\\)"); // url('....')"
- public static Pattern forbiddenStylePattern = Pattern.compile("(?:(expression|eval|javascript))\\s*\\("); // expression(....)" thanks to Ben Summer
+ // prop="...."
+ private static Pattern attributesPattern = Pattern.compile("(\\w*)\\s*=\\s*\"([^\"]*)\"");
+ // color:red;
+ private static Pattern stylePattern = Pattern.compile("([^\\s^:]+)\\s*:\\s*([^;]+);?");
+ // url('....')"
+ private static Pattern urlStylePattern = Pattern.compile("(?i).*\\b\\s*url\\s*\\(['\"]([^)]*)['\"]\\)");
+ // expression(....)" thanks to Ben Summer
+ private static Pattern forbiddenStylePattern = Pattern.compile("(?:(expression|eval|javascript))\\s*\\(");
/**
* This method should be used to test input.
@@ -114,7 +121,7 @@ public class HTMLSanitizer {
public static SanitizeResult sanitizer(String html, Pattern allowedTags, Pattern forbiddenTags) {
SanitizeResult ret = new SanitizeResult();
- Stack<String> openTags = new Stack();
+ Stack<String> openTags = new Stack<String>();
List<String> tokens = tokenize(html);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java Mon Mar 24 01:31:51 2014
@@ -547,12 +547,12 @@ public class MailUtil {
// send message to author of approved comment
try {
sendTextMessage(
- from, // from
+ from,
new String[] {cd.getEmail()}, // to
null, // cc
null, // bcc
- subject, // subject
- msg.toString()); // message
+ subject,
+ msg.toString());
} catch (Exception e) {
log.warn("Exception sending comment mail: " + e.getMessage());
// This will log the stack trace if debug is enabled
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java Mon Mar 24 01:31:51 2014
@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringEs
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -120,7 +121,7 @@ public class Trackback {
// prepare http request
HttpClient client = new HttpClient();
- client.setConnectionTimeout(45 * 1000);
+ client.setConnectionTimeout(45 * RollerConstants.SEC_IN_MS);
HttpMethod method = new PostMethod(trackbackURL);
method.setQueryString(queryString);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java Mon Mar 24 01:31:51 2014
@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUt
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.util.RegexUtil;
+import org.apache.roller.util.RollerConstants;
/**
* General purpose utilities, not for use in templates.
@@ -415,10 +416,10 @@ public class Utilities {
BufferedOutputStream out = new BufferedOutputStream(output);
byte[] buffer;
- buffer = new byte[8192];
+ buffer = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
for (length = byteCount; length > 0;) {
- bytes = (int) (length > 8192 ? 8192 : length);
+ bytes = (int) (length > RollerConstants.EIGHT_KB_IN_BYTES ? RollerConstants.EIGHT_KB_IN_BYTES : length);
try {
bytes = in.read(buffer, 0, bytes);
@@ -464,9 +465,9 @@ public class Utilities {
throws IOException {
BufferedInputStream in = new BufferedInputStream(input);
BufferedOutputStream out = new BufferedOutputStream(output);
- byte buffer[] = new byte[8192];
+ byte buffer[] = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
for (int count = 0; count != -1;) {
- count = in.read(buffer, 0, 8192);
+ count = in.read(buffer, 0, RollerConstants.EIGHT_KB_IN_BYTES);
if (count != -1) {
out.write(buffer, 0, count);
}
@@ -744,8 +745,8 @@ public class Utilities {
StringBuilder result = new StringBuilder(str);
StringBuilder lcresult = new StringBuilder(str.toLowerCase());
- // <img should take care of smileys
- String[] visibleTags = { "<img" }; // are there others to add?
+ // <img should take care of smileys, others to add?
+ String[] visibleTags = { "<img" };
int stringIndex;
for (int j = 0; j < visibleTags.length; j++) {
while ((stringIndex = lcresult.indexOf(visibleTags[j])) != -1) {
@@ -771,9 +772,8 @@ public class Utilities {
// TODO: This code is buggy by nature. It doesn't deal with nesting of
// tags properly.
- // remove certain elements with open & close tags
- String[] openCloseTags = { "li", "a", "div", "h1", "h2", "h3", "h4" }; // more
- // ?
+ // remove certain elements with open & close tags, more available?
+ String[] openCloseTags = { "li", "a", "div", "h1", "h2", "h3", "h4" };
for (int j = 0; j < openCloseTags.length; j++) {
// could this be better done with a regular expression?
String closeTag = "</" + openCloseTags[j] + ">";
@@ -959,9 +959,10 @@ public class Utilities {
char c = charArray[i];
// fast-path exclusions quotes and commas are obvious
+ // 34 = double-quote, 44 = comma
switch (c) {
- case 34: // "
- case 44: // ,
+ case 34:
+ case 44:
continue;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CachedContent.java Mon Mar 24 01:31:51 2014
@@ -9,6 +9,7 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
/**
@@ -18,9 +19,6 @@ public class CachedContent implements Se
private static Log log = LogFactory.getLog(CachedContent.class);
- // default to an 8K buffered cache
- public static final int DEFAULT_SIZE = 8192;
-
// the byte array we use to maintain the cached content
private byte[] content = new byte[0];
@@ -40,7 +38,7 @@ public class CachedContent implements Se
if(size > 0) {
this.outstream = new ByteArrayOutputStream(size);
} else {
- this.outstream = new ByteArrayOutputStream(DEFAULT_SIZE);
+ this.outstream = new ByteArrayOutputStream(RollerConstants.EIGHT_KB_IN_BYTES);
}
// construct writer from output stream
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java Mon Mar 24 01:31:51 2014
@@ -20,6 +20,7 @@ package org.apache.roller.weblogger.util
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
/**
@@ -35,7 +36,7 @@ public class ExpiringLRUCacheImpl extend
protected ExpiringLRUCacheImpl(String id) {
super(id);
- this.timeout = 60 * 60 * 1000;
+ this.timeout = 60 * RollerConstants.MIN_IN_MS;
}
@@ -44,8 +45,8 @@ public class ExpiringLRUCacheImpl extend
super(id, maxsize);
// timeout is specified in seconds; only positive values allowed
- if(timeout > 0) {
- this.timeout = timeout * 1000;
+ if (timeout > 0) {
+ this.timeout = timeout * RollerConstants.SEC_IN_MS;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java Mon Mar 24 01:31:51 2014
@@ -39,7 +39,6 @@ public class LRUCacheFactoryImpl impleme
* Construct a new instance of a Roller LRUCache.
*/
public Cache constructCache(Map properties) {
-
int size = 100;
String id = "unknown";
@@ -50,7 +49,7 @@ public class LRUCacheFactoryImpl impleme
}
String cacheId = (String) properties.get("id");
- if(cacheId != null) {
+ if (cacheId != null) {
id = cacheId;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java Mon Mar 24 01:31:51 2014
@@ -171,7 +171,7 @@ public class EntryCollection {
throw new AtomNotAuthorizedException("Not authorized to access website: " + handle);
}
List<WeblogEntry> entries = roller.getWeblogEntryManager().getWeblogEntries(
- website, // website
+ website,
null, // user
null, // startDate
null, // endDate
@@ -208,7 +208,7 @@ public class EntryCollection {
feed.setUpdated(entry.getUpdated());
}
}
- List links = new ArrayList();
+ List<Link> links = new ArrayList<Link>();
if (entries.size() > max) {
// add next link
int nextOffset = start + max;
@@ -326,7 +326,7 @@ public class EntryCollection {
Content content = new Content();
content.setType(Content.HTML);
content.setValue(entry.getText());
- List contents = new ArrayList();
+ List<Content> contents = new ArrayList<Content>();
contents.add(content);
atomEntry.setContents(contents);
@@ -364,7 +364,7 @@ public class EntryCollection {
Link altlink = new Link();
altlink.setRel("alternate");
altlink.setHref(entry.getPermalink());
- List altlinks = new ArrayList();
+ List<Link> altlinks = new ArrayList<Link>();
altlinks.add(altlink);
atomEntry.setAlternateLinks(altlinks);
@@ -373,11 +373,11 @@ public class EntryCollection {
editlink.setHref(
atomURL
+"/"+entry.getWebsite().getHandle() + "/entry/" + entry.getId());
- List otherlinks = new ArrayList();
+ List<Link> otherlinks = new ArrayList<Link>();
otherlinks.add(editlink);
atomEntry.setOtherLinks(otherlinks);
- List modules = new ArrayList();
+ List<AppModule> modules = new ArrayList<AppModule>();
AppModule app = new AppModuleImpl();
app.setDraft(!WeblogEntry.PUBLISHED.equals(entry.getStatus()));
app.setEdited(entry.getUpdateTime());
@@ -424,11 +424,9 @@ public class EntryCollection {
// Atom categories with weblog-level scheme are Weblogger categories.
// Atom supports multiple cats, but Weblogger supports one/entry
// so here we take accept the first category that exists.
- List categories = entry.getCategories();
+ List<Category> categories = entry.getCategories();
if (categories != null && categories.size() > 0) {
- for (int i=0; i<categories.size(); i++) {
- Category cat = (Category)categories.get(i);
-
+ for (Category cat : categories) {
if (cat.getScheme() != null && cat.getScheme().equals(
RollerAtomService.getWeblogCategoryScheme(rollerEntry.getWebsite()))) {
String catString = cat.getTerm();
@@ -455,8 +453,7 @@ public class EntryCollection {
String tags = "";
StringBuilder buff = new StringBuilder();
if (categories != null && categories.size() > 0) {
- for (int i=0; i<categories.size(); i++) {
- Category cat = (Category)categories.get(i);
+ for (Category cat : categories) {
if (cat.getScheme() == null) {
buff.append(" ").append(cat.getTerm());
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.User;
@@ -519,7 +520,7 @@ public class RollerAtomHandler implement
if (throttle) {
try {
synchronized (RollerAtomHandler.class) {
- Thread.sleep(1000);
+ Thread.sleep(RollerConstants.SEC_IN_MS);
}
} catch (Exception ignored) {}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Mon Mar 24 01:31:51 2014
@@ -463,7 +463,7 @@ public class BloggerAPIHandler extends B
WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
if (website != null) {
Map<Date, List<WeblogEntry>> entries = weblogMgr.getWeblogEntryObjectMap(
- website, // website
+ website,
null, // startDate
new Date(), // endDate
null, // catName
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Mon Mar 24 01:31:51 2014
@@ -28,6 +28,7 @@ import java.util.Vector;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.business.WeblogEntryManager;
@@ -187,7 +188,7 @@ public class MetaWeblogAPIHandler extend
// TODO: Weblogger timestamps need better than 1 second accuracy
// Until then, we can't allow more than one post per second
- Thread.sleep(1000);
+ Thread.sleep(RollerConstants.SEC_IN_MS);
return true;
} catch (Exception e) {
@@ -306,7 +307,7 @@ public class MetaWeblogAPIHandler extend
// TODO: Weblogger timestamps need better than 1 second accuracy
// Until then, we can't allow more than one post per second
- Thread.sleep(1000);
+ Thread.sleep(RollerConstants.SEC_IN_MS);
return entry.getId();
} catch (Exception e) {
@@ -436,7 +437,7 @@ public class MetaWeblogAPIHandler extend
WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
if (website != null) {
List<WeblogEntry> entries = weblogMgr.getWeblogEntries(
- website, // website
+ website,
null,
null, // startDate
null, // endDate
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java Mon Mar 24 01:31:51 2014
@@ -21,6 +21,7 @@ import java.sql.Timestamp;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.operations.AddEntryOperation;
@@ -134,7 +135,7 @@ public class IndexManagerTest extends Te
imgr.executeIndexOperationNow(
new AddEntryOperation(WebloggerFactory.getWeblogger(), (IndexManagerImpl)imgr, wd2));
- Thread.sleep(1000);
+ Thread.sleep(RollerConstants.SEC_IN_MS);
SearchOperation search = new SearchOperation(imgr);
search.setTerm("Enterprise");
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java Mon Mar 24 01:31:51 2014
@@ -3,6 +3,7 @@ package org.apache.roller.weblogger.busi
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.StatCount;
@@ -50,7 +51,7 @@ public class WeblogStatsTest extends Tes
comment21 = TestUtils.setupComment("Comment21", entry21);
TestUtils.endSession(true);
- Thread.sleep(1000);
+ Thread.sleep(RollerConstants.SEC_IN_MS);
}
public void testGetMostCommentedWeblogs() throws Exception {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();