THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
...
Weblog.java
In this class, the only changes change is to return the correct URL if the weblog is one for which a weblog.absolute.*
URL is specified. The proposal is to make these changes directly to Roller's Weblog.java.
...
Code Block |
---|
Index: src/java/org/apache/roller/weblogger/pojos/Weblog.java =================================================================== --- src/java/org/apache/roller/weblogger/pojos/Weblog.java (revision 618002) +++ src/java/org/apache/roller/weblogger/pojos/Weblog.java (working copy) @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; -import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.roller.weblogger.WebloggerException; @@ -45,6 +44,7 @@ import org.apache.roller.weblogger.business.themes.ThemeManager; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.util.UUIDGenerator; +import org.apache.roller.weblogger.config.WebloggerConfig; import org.apache.roller.weblogger.util.I18nUtils; @@ -838,10 +838,14 @@ * @roller.wrapPojoMethod type="simple" */ public String getAbsoluteURL() { - // TODO: ATLAS reconcile entry.getPermaLink() with new URLs - String relPath = WebloggerRuntimeConfig.getAbsoluteContextURL(); - return relPath + "/" + getHandle(); - //return URLUtilities.getWeblogURL(this, null, true); + String weblogAbsoluteURL = + WebloggerConfig.getProperty("weblog.absoluteurl." + getHandle()); + if (weblogAbsoluteURL != null) { + return weblogAbsoluteURL + "/" + getHandle(); + } else { + String relPath = WebloggerRuntimeConfig.getAbsoluteContextURL(); + return relPath + "/" + getHandle(); + } } public void setAbsoluteURL(String url) { // noop |
...
MultiDomainURLModel.java
In this class, the only changes change is to return the correct URL if the weblog is one for which a weblog.absolute.*
URL is specified.
...