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 2006/05/12 20:30:11 UTC
svn commit: r405825 - in
/incubator/roller/branches/roller_2.3/src/org/apache/roller:
presentation/servlets/ presentation/velocity/ presentation/weblog/actions/
presentation/weblog/tags/ presentation/website/actions/
presentation/website/formbeans/ web...
Author: snoopdave
Date: Fri May 12 11:30:09 2006
New Revision: 405825
URL: http://svn.apache.org/viewcvs?rev=405825&view=rev
Log:
Merging fixes from trunk
Modified:
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/servlets/TrackbackServlet.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/velocity/PageHelper.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java
incubator/roller/branches/roller_2.3/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/servlets/TrackbackServlet.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/servlets/TrackbackServlet.java Fri May 12 11:30:09 2006
@@ -179,7 +179,7 @@
// ...ensure trackbacker actually links to us
RollerContext rctx= RollerContext.getRollerContext();
- String absurl = rctx.getAbsoluteContextUrl();
+ String absurl = rctx.getAbsoluteContextUrl(req);
LinkbackExtractor linkback = new LinkbackExtractor(
comment.getUrl(), absurl + entry.getPermaLink());
if (linkback.getExcerpt() == null) {
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/velocity/PageHelper.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/velocity/PageHelper.java Fri May 12 11:30:09 2006
@@ -107,7 +107,7 @@
mPagePlugins = ppmgr.createAndInitPagePlugins(
mWebsite,
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
mVelocityContext);
}
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java Fri May 12 11:30:09 2006
@@ -648,7 +648,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
new VelocityContext());
String content = "";
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java Fri May 12 11:30:09 2006
@@ -229,7 +229,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
getWebsite(),
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
new VelocityContext());
Iterator it = plugins.values().iterator();
while (it.hasNext()) list.add(it.next());
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java Fri May 12 11:30:09 2006
@@ -71,9 +71,8 @@
try {
PagePluginManager ppmgr = roller.getPagePluginManager();
Map plugins = ppmgr.createAndInitPagePlugins(
- entry.getWebsite(),
- rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ entry.getWebsite(), rctx.getServletContext(),
+ rctx.getAbsoluteContextUrl((HttpServletRequest)pageContext.getRequest()),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(
entry, plugins, entry.getText(), singleEntry);
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java Fri May 12 11:30:09 2006
@@ -69,7 +69,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ rctx.getAbsoluteContextUrl((HttpServletRequest)pageContext.getRequest()),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(
entry, plugins, entry.getSummary(), true);
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java Fri May 12 11:30:09 2006
@@ -85,7 +85,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ rctx.getAbsoluteContextUrl(request),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(entry, plugins, sourceText, true);
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/actions/WebsiteFormAction.java Fri May 12 11:30:09 2006
@@ -368,7 +368,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
getWebsite(),
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
new VelocityContext());
Iterator it = plugins.values().iterator();
while (it.hasNext()) list.add(it.next());
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/presentation/website/formbeans/WebsiteFormEx.java Fri May 12 11:30:09 2006
@@ -38,7 +38,7 @@
private String bloggerCategoryId;
private String defaultCategoryId;
private String[] defaultPluginsArray;
- private boolean applyCommentDefaults = false;
+ private Boolean applyCommentDefaults = false;
/**
* @return Returns the bloggerCategoryId.
@@ -82,11 +82,11 @@
defaultPluginsArray = strings;
}
- public boolean isApplyCommentDefaults() {
+ public Boolean isApplyCommentDefaults() {
return applyCommentDefaults;
}
- public void setApplyCommentDefaults(boolean applyCommentDefaults) {
+ public void setApplyCommentDefaults(Boolean applyCommentDefaults) {
this.applyCommentDefaults = applyCommentDefaults;
}
@@ -161,6 +161,9 @@
}
if (this.getActive() == null) {
dataHolder.setActive(Boolean.FALSE);
+ }
+ if (this.isApplyCommentDefaults() == null) {
+ dataHolder.setApplyCommentDefaults(false);
}
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
Modified: incubator/roller/branches/roller_2.3/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.3/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?rev=405825&r1=405824&r2=405825&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.3/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/branches/roller_2.3/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Fri May 12 11:30:09 2006
@@ -382,6 +382,8 @@
WeblogManager mgr = mRoller.getWeblogManager();
mgr.removeWeblogEntry(rollerEntry);
mRoller.flush();
+ CacheManager.invalidate(rollerEntry.getWebsite());
+ mRoller.getIndexManager().removeEntryIndexOperation(rollerEntry);
return;
}
throw new Exception("ERROR not authorized to delete entry");