You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/28 01:11:29 UTC
svn commit: r551378 [2/2] - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblogger/business/jpa/
src/java/org/apache/roller/weblogger...
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/BlacklistChecker.java Wed Jun 27 16:11:26 2007
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -68,9 +68,9 @@
List regexRules = new ArrayList();
Blacklist.populateSpamRules(
website.getBlacklist(), stringRules, regexRules, null);
- if (RollerRuntimeConfig.getProperty("spam.blacklist") != null) {
+ if (WebloggerRuntimeConfig.getProperty("spam.blacklist") != null) {
Blacklist.populateSpamRules(
- RollerRuntimeConfig.getProperty("spam.blacklist"), stringRules, regexRules, null);
+ WebloggerRuntimeConfig.getProperty("spam.blacklist"), stringRules, regexRules, null);
}
return Blacklist.matchesRulesOnly(referrerURL, stringRules, regexRules);
}
@@ -88,7 +88,7 @@
Weblog website = c.getWeblogEntry().getWebsite();
Blacklist.populateSpamRules(
website.getBlacklist(), stringRules, regexRules,
- RollerRuntimeConfig.getProperty("spam.blacklist"));
+ WebloggerRuntimeConfig.getProperty("spam.blacklist"));
Blacklist blacklist = Blacklist.getBlacklist();
if ( blacklist.isBlacklisted(c.getUrl(), stringRules, regexRules)
|| blacklist.isBlacklisted(c.getEmail(), stringRules, regexRules)
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Wed Jun 27 16:11:26 2007
@@ -44,7 +44,7 @@
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -166,7 +166,7 @@
String content;
// Figure URL to entry edit page
- String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
+ String rootURL = WebloggerRuntimeConfig.getAbsoluteContextURL();
String url = rootURL + "/roller-ui/menu.rol";
ResourceBundle resources = ResourceBundle.getBundle(
@@ -215,7 +215,7 @@
ResourceBundle resources = ResourceBundle.getBundle(
"ApplicationResources", I18nUtils.toLocale(user.getLocale()));
- String from = RollerRuntimeConfig.getProperty(
+ String from = WebloggerRuntimeConfig.getProperty(
"user.account.activation.mail.from");
String cc[] = new String[0];
@@ -225,7 +225,7 @@
"user.account.activation.mail.subject");
String content;
- String rootURL = RollerRuntimeConfig.getAbsoluteContextURL();
+ String rootURL = WebloggerRuntimeConfig.getAbsoluteContextURL();
StringBuffer sb = new StringBuffer();
@@ -266,7 +266,7 @@
User user = entry.getCreator();
// Only send email if email notificaiton is enabled
- boolean notify = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
+ boolean notify = WebloggerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
if (!notify || !weblog.getEmailComments().booleanValue()) {
// notifications disabled, just bail
return;
@@ -324,7 +324,7 @@
// Determine with mime type to use for e-mail
StringBuffer msg = new StringBuffer();
StringBuffer ownermsg = new StringBuffer();
- boolean escapeHtml = RollerRuntimeConfig.getBooleanProperty("users.comments.escapehtml");
+ boolean escapeHtml = WebloggerRuntimeConfig.getBooleanProperty("users.comments.escapehtml");
// first the commenter message
@@ -499,7 +499,7 @@
User user = entry.getCreator();
// Only send email if email notificaiton is enabled
- boolean notify = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
+ boolean notify = WebloggerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
if (!notify || !weblog.getEmailComments().booleanValue()) {
// notifications disabled, just bail
return;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java Wed Jun 27 16:11:26 2007
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -47,9 +47,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-services/xmlrpc");
@@ -62,9 +62,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-services/app");
@@ -87,9 +87,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/").append(weblog.getHandle()).append("/");
@@ -368,9 +368,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
// json tags service base
@@ -393,9 +393,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/login-redirect.rol");
@@ -412,9 +412,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/logout.rol");
@@ -436,9 +436,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append(namespace);
@@ -472,9 +472,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/entryAdd.rol");
@@ -496,9 +496,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/entryEdit.rol");
@@ -520,9 +520,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/weblogConfig.rol");
@@ -550,9 +550,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/preview/").append(weblog.getHandle()).append("/");
@@ -586,9 +586,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/preview/").append(weblog.getHandle()).append("/");
@@ -621,9 +621,9 @@
StringBuffer url = new StringBuffer();
if(absolute) {
- url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
} else {
- url.append(RollerRuntimeConfig.getRelativeContextURL());
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
}
url.append("/roller-ui/authoring/previewresource/").append(weblog.getHandle()).append("/");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Wed Jun 27 16:11:26 2007
@@ -29,7 +29,7 @@
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -133,7 +133,7 @@
this.uri = new URI(request);
this.roller = WebloggerFactory.getWeblogger();
//TODO: is this the right thing to do? hardcode roller-services?
- this.urlPrefix = RollerRuntimeConfig.getAbsoluteContextURL() + "/roller-services" + ENDPOINT;
+ this.urlPrefix = WebloggerRuntimeConfig.getAbsoluteContextURL() + "/roller-services" + ENDPOINT;
// TODO: decide what to do about authentication, is WSSE going to fly?
//Authenticator auth = new WSSEAuthenticator(request);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Wed Jun 27 16:11:26 2007
@@ -31,7 +31,7 @@
import org.apache.commons.logging.LogFactory;
import org.jdom.Document;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -192,7 +192,7 @@
}
try {
- String def = RollerRuntimeConfig.getProperty("users.editor.pages");
+ String def = WebloggerRuntimeConfig.getProperty("users.editor.pages");
String[] defs = Utilities.stringToStringArray(def,",");
wd.setEditorPage(defs[0]);
} catch (Exception ex) {
@@ -293,7 +293,7 @@
we.setEnabled(wd.getEnabled());
try {
- AppUrl appUrl = new AppUrl(RollerRuntimeConfig.getAbsoluteContextURL(), wd.getHandle());
+ AppUrl appUrl = new AppUrl(WebloggerRuntimeConfig.getAbsoluteContextURL(), wd.getHandle());
we.setAppEntriesUrl(appUrl.getEntryUrl().toString());
we.setAppResourcesUrl(appUrl.getResourceUrl().toString());
} catch (MalformedURLException mfue) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Wed Jun 27 16:11:26 2007
@@ -61,7 +61,7 @@
import org.apache.roller.weblogger.business.FileIOException;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
@@ -299,7 +299,7 @@
}
}
String handle = pathInfo[0];
- String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
Weblog website = roller.getUserManager().getWebsiteByHandle(handle);
if (website == null) {
throw new AtomNotFoundException("Cannot find specified weblog");
@@ -398,7 +398,7 @@
if (!path.equals("")) path = path + File.separator;
String handle = pathInfo[0];
- String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
Weblog website = roller.getUserManager().getWebsiteByHandle(handle);
if (website == null) {
throw new AtomNotFoundException("Cannot find weblog: " + handle);
@@ -985,7 +985,7 @@
summary.setType(Content.HTML);
summary.setValue(entry.getSummary());
- String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
atomEntry.setId( absUrl + entry.getPermaLink());
atomEntry.setTitle( entry.getTitle());
atomEntry.setContents( contents);
@@ -1042,7 +1042,7 @@
}
private Entry createAtomResourceEntry(Weblog website, ThemeResource file) {
- String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
String editURI =
URLUtilities.getAtomProtocolURL(true)+"/"+website.getHandle()
+ "/resource/" + file.getPath() + ".media-link";
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Wed Jun 27 16:11:26 2007
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -275,7 +275,7 @@
Vector result = new Vector();
if (validateUser(userid, password)) {
try {
- String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String contextUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
User user = umgr.getUserByUserName(userid);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Wed Jun 27 16:11:26 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -433,7 +433,7 @@
private Hashtable createPostStruct(WeblogEntry entry, String userid) {
String permalink =
- RollerRuntimeConfig.getAbsoluteContextURL() + entry.getPermaLink();
+ WebloggerRuntimeConfig.getAbsoluteContextURL() + entry.getPermaLink();
Hashtable struct = new Hashtable();
struct.put("title", entry.getTitle());
@@ -462,7 +462,7 @@
private Hashtable createCategoryStruct(WeblogCategory category, String userid) {
- String contextUrl = RollerRuntimeConfig.getAbsoluteContextURL();
+ String contextUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
Hashtable struct = new Hashtable();
struct.put("description", category.getPath());
Modified: roller/trunk/apps/weblogger/web/index.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/index.jsp?view=diff&rev=551378&r1=551377&r2=551378
==============================================================================
--- roller/trunk/apps/weblogger/web/index.jsp (original)
+++ roller/trunk/apps/weblogger/web/index.jsp Wed Jun 27 16:11:26 2007
@@ -18,7 +18,7 @@
// lets see if we have a frontpage blog
String frontpageBlog =
- org.apache.roller.weblogger.config.RollerRuntimeConfig.getProperty("site.frontpage.weblog.handle");
+ org.apache.roller.weblogger.config.WebloggerRuntimeConfig.getProperty("site.frontpage.weblog.handle");
if (frontpageBlog != null && !"".equals(frontpageBlog.trim())) {
// dispatch to frontpage blog