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/06/01 21:43:18 UTC
svn commit: r410925 [2/2] - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/
src/org/apache/roller/config/ src/org/apache/roller/model/
src/org/apache/roller/pojos/ src/org/apache/rolle...
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Thu Jun 1 12:43:16 2006
@@ -110,7 +110,7 @@
if (mUsername != null) {
try {
- this.user = mRoller.getUserManager().getUserByUsername(mUsername);
+ this.user = mRoller.getUserManager().getUserByUserName(mUsername);
} catch (Exception e) {
mLogger.error("ERROR: setting user", e);
}
@@ -630,7 +630,7 @@
}
String digest = null;
try {
- UserData user = mRoller.getUserManager().getUserByUsername(userName);
+ UserData user = mRoller.getUserManager().getUserByUserName(userName);
digest = WSSEUtilities.generateDigest(
WSSEUtilities.base64Decode(nonce),
created.getBytes("UTF-8"),
@@ -663,7 +663,7 @@
int p = userPass.indexOf(":");
if (p != -1) {
userID = userPass.substring(0, p);
- UserData user = mRoller.getUserManager().getUserByUsername(userID);
+ UserData user = mRoller.getUserManager().getUserByUserName(userID);
boolean enabled = user.getEnabled().booleanValue();
if (enabled) {
// are passwords encrypted?
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java Thu Jun 1 12:43:16 2006
@@ -125,7 +125,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
UserManager userMgr = RollerFactory.getRoller().getUserManager();
- user = userMgr.getUserByUsername(username);
+ user = userMgr.getUserByUserName(username);
userEnabled = user.getEnabled().booleanValue();
website = userMgr.getWebsiteByHandle(blogid);
@@ -207,7 +207,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
UserManager userMgr = RollerFactory.getRoller().getUserManager();
- user = userMgr.getUserByUsername(username);
+ user = userMgr.getUserByUserName(username);
enabled = user.getEnabled().booleanValue();
if (enabled)
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java Thu Jun 1 12:43:16 2006
@@ -218,7 +218,7 @@
try {
Roller roller = RollerFactory.getRoller();
UserManager userMgr = roller.getUserManager();
- UserData user = userMgr.getUserByUsername(userid);
+ UserData user = userMgr.getUserByUserName(userid);
// parses full name into two strings, firstname and lastname
String firstname = "", lastname = "";
@@ -283,7 +283,7 @@
RollerContext.getRollerContext().getAbsoluteContextUrl(req);
UserManager umgr = RollerFactory.getRoller().getUserManager();
- UserData user = umgr.getUserByUsername(userid);
+ UserData user = umgr.getUserByUserName(userid);
// get list of user's enabled websites
List websites = umgr.getWebsites(user, Boolean.TRUE, null, 0, -1);
Iterator iter = websites.iterator();
@@ -411,7 +411,7 @@
entry.setText(content);
entry.setPubTime(current);
entry.setUpdateTime(current);
- UserData user = roller.getUserManager().getUserByUsername(userid);
+ UserData user = roller.getUserManager().getUserByUserName(userid);
entry.setCreator(user);
entry.setWebsite(website);
entry.setCategory(website.getBloggerCategory());
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java Thu Jun 1 12:43:16 2006
@@ -241,7 +241,7 @@
try {
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- UserData user = roller.getUserManager().getUserByUsername(userid);
+ UserData user = roller.getUserManager().getUserByUserName(userid);
Timestamp current =
new Timestamp(System.currentTimeMillis());
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java Thu Jun 1 12:43:16 2006
@@ -230,7 +230,7 @@
assertEquals(testWeblog.getId(), ((WebsiteData)weblogs.get(0)).getId());
// assert that website has user
- List users = mgr.getUsers(testWeblog, null);
+ List users = mgr.getUsers(testWeblog, null, 0, Integer.MAX_VALUE);
assertEquals(2, users.size());
// test user can be retired from website
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java Thu Jun 1 12:43:16 2006
@@ -57,7 +57,7 @@
refreshTask.init(getRoller(), "dummy");
refreshTask.run();
- List agg = planet.getAggregation(0, -1);
+ List agg = planet.getAggregation(null, null, 0, -1);
int size = agg.size();
assertEquals(mBlogCount * mExpectedPublishedEntryCount, size);
}
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java Thu Jun 1 12:43:16 2006
@@ -354,10 +354,10 @@
PlanetGroupData group = planet.getGroup("test_handle");
assertNotNull(group);
- List bigag = planet.getAggregation(group, 0, 30);
+ List bigag = planet.getAggregation(group, null, null, 0, 30);
assertEquals(30, bigag.size());
- List littleag = planet.getAggregation(group, 0, 10);
+ List littleag = planet.getAggregation(group, null, null, 0, 10);
assertEquals(10, littleag.size());
planet.deleteGroup(group);
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/RefererTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/RefererTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/RefererTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/RefererTest.java Thu Jun 1 12:43:16 2006
@@ -262,13 +262,13 @@
log.info("Test apply referers (weblog)");
RefererManager rmgr = RollerFactory.getRoller().getRefererManager();
- List sites = rmgr.getDaysPopularWebsites(0, 0, 1);
+ List sites = rmgr.getDaysPopularWebsites(0, 1);
assertEquals(1, sites.size());
- sites = rmgr.getDaysPopularWebsites(0, 1, 1);
+ sites = rmgr.getDaysPopularWebsites(1, 1);
assertEquals(1, sites.size());
- sites = rmgr.getDaysPopularWebsites(0, 0, 20);
+ sites = rmgr.getDaysPopularWebsites(0, 20);
assertEquals(2, sites.size());
WebsiteDisplayData site1 = (WebsiteDisplayData)sites.get(0);
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java Thu Jun 1 12:43:16 2006
@@ -138,7 +138,7 @@
// lookup by UserName (part)
user = null;
- List users1 = mgr.getUsersStartingWith(testUser.getUserName().substring(0, 3), 0, 1, Boolean.TRUE);
+ List users1 = mgr.getUsersStartingWith(testUser.getUserName().substring(0, 3), Boolean.TRUE, 0, 1);
assertEquals(1, users1.size());
user = (UserData) users1.get(0);
assertNotNull(user);
@@ -146,7 +146,7 @@
// lookup by Email (part)
user = null;
- List users2 = mgr.getUsersStartingWith(testUser.getEmailAddress().substring(0, 3), 0, 1, Boolean.TRUE);
+ List users2 = mgr.getUsersStartingWith(testUser.getEmailAddress().substring(0, 3), Boolean.TRUE, 0, 1);
assertEquals(1, users2.size());
user = (UserData) users2.get(0);
assertNotNull(user);
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogEntryTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogEntryTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogEntryTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogEntryTest.java Thu Jun 1 12:43:16 2006
@@ -183,7 +183,7 @@
// get all entries for weblog
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, null);
+ entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, 0, Integer.MAX_VALUE);
assertNotNull(entries);
assertEquals(3, entries.size());
assertEquals(entry3, entries.get(0));
@@ -194,34 +194,34 @@
assertNotNull(entries);
assertEquals(3, entries.size());
- // get all published entries only
+ // get all published entries only
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, WeblogEntryData.PUBLISHED, null, null);
+ entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, WeblogEntryData.PUBLISHED, null, 0, Integer.MAX_VALUE);
assertNotNull(entries);
assertEquals(2, entries.size());
// get all entries in date range
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, entry2.getPubTime(), entry2.getPubTime(), null, null, null, null);
+ entries = mgr.getWeblogEntries(testWeblog, null, entry2.getPubTime(), entry2.getPubTime(), null, null, null, 0, Integer.MAX_VALUE);
assertNotNull(entries);
assertEquals(1, entries.size());
assertEquals(entry2, entries.get(0));
// get all entries, limited to maxSize
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, new Integer(2));
+ entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, 0, 2);
assertNotNull(entries);
assertEquals(2, entries.size());
// get all entries in category
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, null, null, testWeblog.getDefaultCategory().getName(), null, null, null);
+ entries = mgr.getWeblogEntries(testWeblog, null, null, null, testWeblog.getDefaultCategory().getName(), null, null, 0, Integer.MAX_VALUE);
assertNotNull(entries);
assertEquals(3, entries.size());
// get all entries, limited by offset/range
entries = null;
- entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, 1, 2);
+ entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, 0, Integer.MAX_VALUE);
assertNotNull(entries);
assertEquals(2, entries.size());
assertEquals(entry2, entries.get(0));
@@ -261,13 +261,13 @@
// get object map
entryMap = null;
- entryMap = mgr.getWeblogEntryObjectMap(testWeblog, null, null, null, null, null);
+ entryMap = mgr.getWeblogEntryObjectMap(testWeblog, null, null, null, null);
assertNotNull(entryMap);
assertTrue(entryMap.keySet().size() > 1);
// get string map
entryMap = null;
- entryMap = mgr.getWeblogEntryStringMap(testWeblog, null, null, null, null, null);
+ entryMap = mgr.getWeblogEntryStringMap(testWeblog, null, null, null, null);
assertNotNull(entryMap);
assertTrue(entryMap.keySet().size() > 1);
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java Thu Jun 1 12:43:16 2006
@@ -55,7 +55,7 @@
}
public void testGetMostCommentedWeblogs() throws Exception {
UserManager mgr = RollerFactory.getRoller().getUserManager();
- List list = mgr.getMostCommentedWebsites(10, 0, Integer.MAX_VALUE);
+ List list = mgr.getMostCommentedWebsites(null, null, 0, Integer.MAX_VALUE);
assertNotNull(list);
assertEquals(2, list.size());
@@ -70,7 +70,7 @@
}
public void testGetMostCommentedWeblogEntries() throws Exception {
WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
- List list = mgr.getMostCommentedWeblogEntries(null, 10, 0, Integer.MAX_VALUE);
+ List list = mgr.getMostCommentedWeblogEntries(null, null, null, 0, Integer.MAX_VALUE);
assertNotNull(list);
assertEquals(3, list.size());
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java Thu Jun 1 12:43:16 2006
@@ -57,7 +57,7 @@
try
{
umgr = getRoller().getUserManager();
- user = (UserData)umgr.getUsers(mWebsite, null).get(0);
+ user = (UserData)umgr.getUsers(mWebsite, null, 0, Integer.MAX_VALUE).get(0);
doFilters();
authenticateUser(user.getUserName(), "editor");
}
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java Thu Jun 1 12:43:16 2006
@@ -48,7 +48,7 @@
try
{
umgr = getRoller().getUserManager();
- user = (UserData)umgr.getUsers(mWebsite, null).get(0);
+ user = (UserData)umgr.getUsers(mWebsite, null, 0, Integer.MAX_VALUE).get(0);
authenticateUser(user.getUserName(), "editor");
}
catch (RollerException e)
Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/ExportRssTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/ExportRssTest.java?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/ExportRssTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/ExportRssTest.java Thu Jun 1 12:43:16 2006
@@ -55,12 +55,13 @@
List entries = getRoller().getWeblogManager().getWeblogEntries(
null, // userName
-null, null, // startDate
+ null,
+ null, // startDate
new Date(), // endDate
null, // catName
null, // status
null, // sortby
- new Integer(5)); // maxEntries
+ 0, Integer.MAX_VALUE); // maxEntries
try
{
@@ -103,7 +104,7 @@
* @param mContext
* @throws IOException
*/
- private void setupVelocityProperties(MockServletContext mContext) throws IOException
+ private void setupVelocityProperties(MockServletContext mContext) throws IOException
{
InputStream is = this.getClass().getClassLoader().getResourceAsStream("velocity.properties");
if (is == null) fail("Unable to find velocity.properties");
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/comments.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/comments.vm?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/comments.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/comments.vm Thu Jun 1 12:43:16 2006
@@ -11,7 +11,7 @@
#macro( showCommentsLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
#if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
- #set( $link = "$ctxPath$entry.permaLink&popup=true#comments" )
+ #set( $link = "$entry.permaLink&popup=true#comments" )
<a href="$link " onclick="window.open('$link', 'comments',
'width=480,height=480,scrollbars=yes,status=yes,resizable'); return false;"
class="entrycommentslink">$text.get( "macro.weblog.comments" ) [$commentCount]</a>
@@ -25,7 +25,7 @@
#macro( showCommentsPageLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
#if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
- #set( $link = "$ctxPath$entry.permaLink#comments" )
+ #set( $link = "$entry.permaLink#comments" )
<a href="$link" class="entrycommentslink">$text.get( "macro.weblog.comments" ) [$commentCount]</a>
#end
#end
@@ -41,7 +41,7 @@
<div class="comments" id="comments">
<div id="commentTwisty$entry.Id" class="commentTwisty"
onclick="toggleComments('$entry.Id', '${ctxPath}/page/${website.handle}'); return false;">
- <a href="$ctxPath$entry.permaLink" class="plain">
+ <a href="$entry.permaLink" class="plain">
#if($commentCount == 0)
$text.get( "macro.weblog.addcomment" )
#elseif($commentCount == 1)
@@ -72,7 +72,7 @@
$text.get( "macro.weblog.postedbywebsite", [$comment.url, $comment.url] )
#end
#if( $showPermalink )
- <a href="${ctxPath}${entry.permaLink}#comment${velocityCount}"
+ <a href="${entry.permaLink}#comment${velocityCount}"
class="entrypermalink"
title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
#end
@@ -135,7 +135,7 @@
#set($content = $utilities.addNofollow($content))
<div class="comment" style="border: 1px solid #dadada; padding-left: 3px; padding-right: 5px;" >
<p>Commenting on <a class="entrypermalink"
- href="${ctxPath}${comment.weblogEntry.permaLink}">${comment.weblogEntry.title}</a>:</p>
+ href="${comment.weblogEntry.permaLink}">${comment.weblogEntry.title}</a>:</p>
${content}
#showCommentDetails($comment false)
</div>
@@ -158,7 +158,7 @@
#set($content = $utilities.encodeEmail($comment.content))
#set($content = $utilities.addNofollow($content))
<li class="commentsListItem"><a
- href="${ctxPath}${comment.weblogEntry.permaLink}#comments"
+ href="${comment.weblogEntry.permaLink}#comments"
class="entrypermalink"
title="$text.get( "macro.weblog.commentpermalink.title" ) to
'$utilities.removeHTML($comment.weblogEntry.title)'"
Added: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/error-page.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/error-page.vm?rev=410925&view=auto
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/error-page.vm (added)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/error-page.vm Thu Jun 1 12:43:16 2006
@@ -0,0 +1,6 @@
+<html>
+<body>
+<h1>Velocity template error</h1>
+ERROR message [$!displayException.getMessage()]
+</body>
+</html>
\ No newline at end of file
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/atom.vm?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/atom.vm Thu Jun 1 12:43:16 2006
@@ -23,10 +23,10 @@
#set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
#foreach( $entry in $entries )
<entry>
- <id>$absBaseURL$entry.permaLink</id>
+ <id>$entry.permaLink</id>
<title type="html">$utilities.textToHTML($entry.title,true)</title>
<author><name>$entry.creator.fullName</name></author>
- <link rel="alternate" type="text/html" href="$absBaseURL$entry.permaLink"/>
+ <link rel="alternate" type="text/html" href="$entry.permaLink"/>
<published>$utilities.formatIso8601Date($entry.pubTime)</published>
<updated>$utilities.formatIso8601Date($entry.updateTime)</updated>
<category term="$utilities.textToHTML($entry.category.path, true)" label="$utilities.textToHTML($entry.category.name, true)" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/rss.vm?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/flavors/rss.vm Thu Jun 1 12:43:16 2006
@@ -13,10 +13,10 @@
#set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
#foreach( $entry in $entries )
<item>
- <guid isPermaLink="true">$absBaseURL$entry.permaLink</guid>
+ <guid isPermaLink="true">$entry.permaLink</guid>
<title>$utilities.textToHTML($utilities.removeHTML($entry.title))</title>
<dc:creator>$utilities.textToHTML($entry.creator.fullName,true)</dc:creator>
- <link>$absBaseURL$entry.permaLink</link>
+ <link>$entry.permaLink</link>
#if( $entry.link && !$entry.link.trim().equals("") )
<source url="$utilities.textToHTML($entry.link)">$utilities.textToHTML($entry.link)</source>
#end
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/weblog.vm?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/weblog.vm Thu Jun 1 12:43:16 2006
@@ -175,7 +175,7 @@
#if( $pageModel.previousEntry )
#set( $prev = $pageModel.previousEntry )
#if( $pageModel.weblogEntry )
- #set( $prevURL = "${ctxPath}${prev.permaLink}" )
+ #set( $prevURL = "${prev.permaLink}" )
<a href="$prevURL" title="Previous Entry"
> « $utilities.truncateNicely($prev.title, 25, 25, "...")</a>
#else
@@ -196,7 +196,7 @@
#if( $pageModel.nextEntry )
#set( $next = $pageModel.nextEntry )
#if( $pageModel.weblogEntry )
- #set( $nextURL = "${ctxPath}${next.permaLink}" )
+ #set( $nextURL = "${next.permaLink}" )
<a href="$nextURL" title="Next Entry"
>$utilities.truncateNicely($next.title, 25, 25, "...") » </a>
#else
@@ -236,7 +236,7 @@
#if( $utilities.isNotEmpty($entry.summary) )
#set( $sourceText = $entry.summary )
#if( $utilities.isNotEmpty($entry.text) )
- #set( $readMore = "<a class='readmore' href='$baseURL$entry.permaLink'> ...</a>" )
+ #set( $readMore = "<a class='readmore' href='$entry.permaLink'> ...</a>" )
#set( $sourceText = "$sourceText$readMore")
#end
#else
@@ -335,7 +335,7 @@
* @param entry WeblogEntry object.
*#
#macro( showEntryPermalink $entry )
- <a href="$baseURL$entry.permaLink"
+ <a href="$entry.permaLink"
title="$text.get( "macro.weblog.entrypermalink.title" )"
class="entrypermalink">Permalink</a>
#if ($pageHelper.isUserAuthorizedToEdit())
@@ -370,10 +370,10 @@
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description
- rdf:about="$absBaseURL$entry.permaLink"
+ rdf:about="$entry.permaLink"
trackback:ping="#showTrackbackURL($entry)"
dc:title="$entry.title"
- dc:identifier="$absBaseURL$entry.permaLink"
+ dc:identifier="$entry.permaLink"
dc:subject="$entry.category.name"
dc:description="$entry.title"
dc:creator="$entry.creator.userName"
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp Thu Jun 1 12:43:16 2006
@@ -45,7 +45,7 @@
<c:forEach var="post" items="${pinnedPosts}">
<div class="entryBoxPinned">
- <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
+ <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
<str:truncateNicely upper="90" >
<c:out value="${post.displayTitle}" />
</str:truncateNicely></a>
@@ -79,7 +79,7 @@
<c:if test="${!post.pinnedToMain}">
<div class="entryBox">
- <a href='<c:out value="${baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
+ <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
<str:truncateNicely upper="90" >
<c:out value="${post.displayTitle}" />
</str:truncateNicely></a>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp Thu Jun 1 12:43:16 2006
@@ -291,7 +291,7 @@
<td style="border: none; padding:0px;">
<fmt:message key="commentManagement.entryTitled" /></td>
<td class="details" style="border: none; padding:0px;">
- <a href='<c:out value="${model.baseURL}" /><c:out value="${comment.weblogEntry.permaLink}" />'>
+ <a href='<c:out value="${comment.weblogEntry.permaLink}" />'>
<c:out value="${comment.weblogEntry.title}" /></a>
</td>
</tr>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp Thu Jun 1 12:43:16 2006
@@ -168,7 +168,7 @@
<td>
<c:if test='${post.status == "PUBLISHED"}'>
- <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />'>
+ <a href='<c:out value="${post.permaLink}" />'>
<fmt:message key="weblogEntryQuery.view" />
</a>
</c:if>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp Thu Jun 1 12:43:16 2006
@@ -122,7 +122,7 @@
<div class="daybox" style="margin: 0px 5px 0px 10px">
<c:forEach var="post" items="${dayMap}">
- <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />' class="entryTitle">
+ <a href='<c:out value="${post.permaLink}" />' class="entryTitle">
<str:truncateNicely upper="90" >
<c:out value="${post.displayTitle}" />
</str:truncateNicely></a>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity.properties?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity.properties Thu Jun 1 12:43:16 2006
@@ -61,9 +61,8 @@
# Allow Velocimacros to be defined in regular templates
velocimacro.permissions.allow.inline=true
-# I *think* this will allow users to override macros
-# for themselves, but not everyone...
-velocimacro.permissions.allow.inline.local.scope=true
+# Allow template authors to define macros in any template
+velocimacro.permissions.allow.inline.local.scope=false
# set encoding/charset to UTF-8
input.encoding=UTF-8
Modified: incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm?rev=410925&r1=410924&r2=410925&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/sotto/_day.vm Thu Jun 1 12:43:16 2006
@@ -32,7 +32,7 @@
#if($website.allowComments)
<span class="noDisplay">[</span>
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
- #set( $link = "$ctxPath$entry.permaLink" )
+ #set( $link = "$entry.permaLink" )
<a href="$link" class="storyLink">
Comments [$commentCount]</a>
<span class="noDisplay">]</span>