You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/06/03 16:00:41 UTC
svn commit: r543893 [4/4] - in /roller/branches/roller_guice/apps:
planet/nbproject/ weblogger/ weblogger/nbproject/
weblogger/src/java/org/apache/roller/weblogger/
weblogger/src/java/org/apache/roller/weblogger/business/
weblogger/src/java/org/apache/...
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm Sun Jun 3 07:00:36 2007
@@ -24,11 +24,11 @@
<title>$utils.escapeXML($config.siteName)</title>
<link>$url.absoluteSite</link>
#if($model.tags)
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rssByTags($model.tags, $model.excerpts)" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rssByTags($model.tags, $model.excerpts)" />
#elseif($model.categoryPath)
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
#else
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss" />
#end
<description>$utils.escapeXML($config.siteDescription)</description>
<language>en-us</language>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm Sun Jun 3 07:00:36 2007
@@ -16,21 +16,18 @@
directory of this distribution.
*#<?xml version="1.0" encoding='utf-8'?>
-#if($config.feedStyle)
-<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>
-#end
-#set($pager = $model.getCommentsPager())
-#set($comments = $pager.items)
+#if($config.feedStyle)<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>#end
+#set($pager = $model.commentsPager)
<feed xmlns="http://www.w3.org/2005/Atom">
<title type="html">$utils.escapeXML($model.weblog.name) (Comments)</title>
<id>$url.feed.comments.atom</id>
<link rel="alternate" type="text/html" href="$url.home" />
<link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
-#if($config.feedHistoryEnabled)
-#showFeedHistory($pager)
-#end
+ #if($config.feedHistoryEnabled)
+ #showFeedHistory($pager)
+ #end
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
<generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache Roller (incubating)</generator>
-#showCommentsAtom10($comments)
+ #showCommentsAtom10($pager.items)
</feed>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm Sun Jun 3 07:00:36 2007
@@ -29,7 +29,6 @@
<copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
<lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
<generator>Apache Roller (incubating) $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
- #set($comments = $model.getComments())
- #showCommentsRSS20($comments)
+ #showCommentsRSS20($model.commentsPager.items)
</channel>
</rss>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm Sun Jun 3 07:00:36 2007
@@ -16,28 +16,25 @@
directory of this distribution.
*#<?xml version="1.0" encoding='utf-8'?>
-#if($config.feedStyle)
-<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>
-#end
-#set($pager = $model.getWeblogEntriesPager())
-#set($entries = $pager.items)
+#if($config.feedStyle)<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>#end
+#set($pager = $model.weblogEntriesPager)
<feed xmlns="http://www.w3.org/2005/Atom">
<title type="html">$utils.escapeXML($model.weblog.name)</title>
<subtitle type="html">$utils.escapeXML($model.weblog.description)</subtitle>
<id>$url.feed.entries.atom</id>
-#if($model.tags)
- <link rel="self" type="application/atom+xml" href="$url.feed.entries.atomByTags($model.tags, $model.excerpts)" />
-#elseif($model.categoryPath)
- <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
-#else
- <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom" />
-#end
+ #if($model.tags)
+ <link rel="self" type="application/atom+xml" href="$url.feed.entries.atomByTags($model.tags, $model.excerpts)" />
+ #elseif($model.categoryPath)
+ <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
+ #else
+ <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom" />
+ #end
<link rel="alternate" type="text/html" href="$url.home" />
-#if($config.feedHistoryEnabled)
- #showFeedHistory($pager)
-#end
+ #if($config.feedHistoryEnabled)
+ #showFeedHistory($pager)
+ #end
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
<generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache Roller (incubating)</generator>
-#showEntriesAtom10($entries)
+ #showEntriesAtom10($pager.items)
</feed>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm Sun Jun 3 07:00:36 2007
@@ -24,18 +24,18 @@
<title>$utils.escapeXML($utils.removeHTML($model.weblog.name))</title>
<link>$url.home</link>
#if($model.tags)
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rssByTags($model.tags, $model.excerpts)" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rssByTags($model.tags, $model.excerpts)" />
#elseif($model.categoryPath)
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
#else
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss" />
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss" />
#end
<description>$utils.escapeXML($model.weblog.description)</description>
<language>en-us</language>
<copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
<lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
<generator>Apache Roller (incubating) $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
- #set($entries = $model.getWeblogEntries())
+ #set($entries = $model.weblogEntriesPager.items)
#showEntriesRSS20($entries)
</channel>
</rss>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm Sun Jun 3 07:00:36 2007
@@ -16,11 +16,8 @@
directory of this distribution.
*#<?xml version="1.0" encoding='utf-8'?>
-#if($config.feedStyle)
-<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>
-#end
-#set($pager = $model.getSearchResultsPager())
-#set($entries = $pager.items)
+#if($config.feedStyle)<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>#end
+#set($pager = $model.searchResultsPager)
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#">
<title type="html">$utils.escapeXML($model.weblog.name)</title>
<subtitle type="html">$utils.escapeXML($model.weblog.description)</subtitle>
@@ -30,6 +27,6 @@
#showFeedHistory($pager)
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
<generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache Roller (incubating)</generator>
- #showEntriesAtom10($entries)
+ #showEntriesAtom10($pager.items)
</feed>
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/weblog.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/weblog.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/weblog.vm Sun Jun 3 07:00:36 2007
@@ -649,7 +649,59 @@
Show weblog author menu with vertical or horizontal orientation.
*#
#macro(showAuthorMenu $vertical)
-$menuModel.showAuthorMenu($vertical)
+
+ #set( $authorMenu = $menuModel.authorMenu )
+ #if( $authorMenu )
+ #if( $vertical )
+ #foreach( $menu in $authorMenu.tabs )
+ <ul class="rMenu">
+ #foreach( $item in $menu.items )
+ <li class="rMenuItem"><a href="$url.action($item.action, '/roller-ui/authoring')">$text.get( $menu.key ):$text.get( $item.key )</a></li>
+ #end
+ </ul>
+ #end
+ #else
+ #set( $menuCnt = 0 )
+ #foreach( $menu in $authorMenu.tabs )
+ #foreach( $item in $menu.items )
+ #if ($menuCnt > 0) | #end
+ <a href="$url.action($item.action, '/roller-ui/authoring')">$text.get( $menu.key ):$text.get( $item.key )</a>
+ #set($menuCnt = $menuCnt + 1)
+ #end
+ #end
+ #end
+ #end
+
+#end
+
+
+#**
+Show weblog author menu with vertical or horizontal orientation.
+*#
+#macro(showAdminMenu $vertical)
+
+ #set( $adminMenu = $menuModel.adminMenu )
+ #if( $adminMenu )
+ #if( $vertical )
+ #foreach( $menu in $adminMenu.tabs )
+ <ul class="rMenu">
+ #foreach( $item in $menu.items )
+ <li class="rMenuItem"><a href="$url.action($item.action, '/roller-ui/admin')">$text.get( $menu.key ):$text.get( $item.key )</a></li>
+ #end
+ </ul>
+ #end
+ #else
+ #set( $menuCnt = 0 )
+ #foreach( $menu in $adminMenu.tabs )
+ #foreach( $item in $menu.items )
+ #if ($menuCnt > 0) | #end
+ <a href="$url.action($item.action, '/roller-ui/admin')">$text.get( $menu.key ):$text.get( $item.key )</a>
+ #set($menuCnt = $menuCnt + 1)
+ #end
+ #end
+ #end
+ #end
+
#end
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml Sun Jun 3 07:00:36 2007
@@ -18,6 +18,13 @@
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
</filter>
+ <!-- This is really strange, but for some reason it's needed to prevent
+ some problems with the file uploads not working intermittently -->
+ <filter>
+ <filter-name>struts2-cleanup</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
+ </filter>
+
<filter>
<filter-name>securityFilter</filter-name>
<filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
@@ -152,6 +159,13 @@
<!-- Struts2 -->
<filter-mapping>
+ <filter-name>struts2-cleanup</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>struts2</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
@@ -241,6 +255,12 @@
</servlet>
<servlet>
+ <servlet-name>PreviewThemeImageServlet</servlet-name>
+ <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PreviewThemeImageServlet</servlet-class>
+ <load-on-startup>9</load-on-startup>
+ </servlet>
+
+ <servlet>
<servlet-name>RedirectServlet</servlet-name>
<servlet-class>org.apache.roller.weblogger.ui.rendering.velocity.deprecated.RedirectServlet</servlet-class>
<load-on-startup>9</load-on-startup>
@@ -343,6 +363,11 @@
<url-pattern>/roller-ui/authoring/previewresource/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>PreviewThemeImageServlet</servlet-name>
+ <url-pattern>/roller-ui/authoring/previewtheme</url-pattern>
+ </servlet-mapping>
+
<!-- Servlets for supporting Ajax -->
<servlet-mapping>
@@ -451,22 +476,12 @@
<error-page>
<exception-type>java.lang.Exception</exception-type>
- <location>/roller-ui/error.rol</location>
- </error-page>
-
- <error-page>
- <error-code>403</error-code>
- <location>/roller-ui/403.rol</location>
+ <location>/WEB-INF/jsps/errors/error.jsp</location>
</error-page>
<error-page>
<error-code>404</error-code>
- <location>/roller-ui/404.rol</location>
- </error-page>
-
- <error-page>
- <error-code>400</error-code>
- <location>/roller-ui/login-redirect.rol</location>
+ <location>/WEB-INF/jsps/errors/404.jsp</location>
</error-page>
Modified: roller/branches/roller_guice/apps/weblogger/web/index.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/index.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/index.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/index.jsp Sun Jun 3 07:00:36 2007
@@ -31,4 +31,4 @@
setuppage.forward(request, response);
}
-%>
+%>
\ No newline at end of file
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/basic/theme.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/basic/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/basic/theme.xml Sun Jun 3 07:00:36 2007
@@ -6,7 +6,7 @@
<author>Roller Weblogger</author>
<!-- theme preview image -->
- <preview-image path="sm-theme-basic.jpg" />
+ <preview-image path="sm-theme-basic.png" />
<!-- custom stylesheet -->
<custom-stylesheet path="basic-custom.css" />
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml Sun Jun 3 07:00:36 2007
@@ -6,7 +6,7 @@
<author>Bryan Bell</author>
<!-- theme preview image -->
- <preview-image path="sm-theme-brushedmetal.jpg" />
+ <preview-image path="sm-theme-brushedmetal.png" />
<!-- templates -->
<template action="weblog">
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/frontpage/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/frontpage/theme.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/frontpage/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/frontpage/theme.xml Sun Jun 3 07:00:36 2007
@@ -6,7 +6,7 @@
<author>Dave Johnson</author>
<!-- theme preview image -->
- <preview-image path="sm-theme-frontpage.jpg" />
+ <preview-image path="sm-theme-frontpage.png" />
<!-- templates -->
<template action="weblog">
Modified: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml Sun Jun 3 07:00:36 2007
@@ -6,7 +6,7 @@
<author>Matt Raible</author>
<!-- theme preview image -->
- <preview-image path="sm-theme-sotto.jpg" />
+ <preview-image path="sm-theme-sotto.png" />
<!-- templates -->
<template action="weblog">