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 2005/06/24 06:31:48 UTC
svn commit: r201564 [3/4] - in /incubator/roller/branches/roller_2.0: ./
contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/
custom/ metadata/database/ metadata/database/hibernate/ nbproject/
personal/testing/ src/org/roller/business...
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/CommentServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/CommentServlet.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/CommentServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/CommentServlet.java Thu Jun 23 21:31:43 2005
@@ -159,26 +159,24 @@
try
{
// Get weblog entry object, put in page context
- WeblogEntryData wd = rreq.getWeblogEntry();
- if (wd == null || wd.getId() == null)
+ WeblogEntryData entry = rreq.getWeblogEntry();
+ WebsiteData website = entry.getWebsite();
+ if (entry == null || entry.getId() == null)
{
throw new RollerException(
"Unable to find WeblogEntry for "
+ request.getParameter(RollerRequest.WEBLOGENTRYID_KEY));
}
- if ( !wd.getWebsite().getAllowComments().booleanValue()
- || !wd.getCommentsStillAllowed())
+ if ( !entry.getWebsite().getAllowComments().booleanValue()
+ || !entry.getCommentsStillAllowed())
{
throw new RollerException("ERROR comments not allowed");
}
- request.setAttribute("blogEntry", wd);
+ request.setAttribute("blogEntry", entry);
- // get the User to which the blog belongs
- UserData user = wd.getWebsite().getUser();
-
// TODO: A hack to be replaced by Object.canEdit()
- request.setAttribute(RollerRequest.OWNING_USER, user);
+ request.setAttribute(RollerRequest.OWNING_WEBSITE, website);
// Save comment
WeblogManager mgr = rreq.getRoller().getWeblogManager();
@@ -186,7 +184,7 @@
CommentData cd = new CommentData();
RequestUtils.populate(cf, request);
cf.copyTo(cd, request.getLocale());
- cd.setWeblogEntry(wd);
+ cd.setWeblogEntry(entry);
cd.setRemoteHost(request.getRemoteHost());
cd.setPostTime(new java.sql.Timestamp(System.currentTimeMillis()));
@@ -196,17 +194,17 @@
{
cd.save();
rreq.getRoller().commit();
- reindexEntry(rreq.getRoller(), wd);
+ reindexEntry(rreq.getRoller(), entry);
// Refresh user's entries in page cache
- PageCacheFilter.removeFromCache(request, user);
+ PageCacheFilter.removeFromCache(request, website);
// Put array of comments in context
- List comments = mgr.getComments(wd.getId());
+ List comments = mgr.getComments(entry.getId());
request.setAttribute("blogComments", comments);
// MR: Added functionality to e-mail comments
- sendEmailNotification(request, rreq, wd, cd, user,comments);
+ sendEmailNotification(request, rreq, entry, cd, website, comments);
super.doPost(request, response);
return;
@@ -250,7 +248,7 @@
request.setAttribute("blogEntry", wd);
// TODO: A hack to be replaced by Object.canEdit()
- request.setAttribute(RollerRequest.OWNING_USER, wd.getWebsite().getUser());
+ request.setAttribute(RollerRequest.OWNING_WEBSITE, wd);
CommentFormEx cf = new CommentFormEx();
RequestUtils.populate(cf, request);
@@ -330,7 +328,7 @@
RollerRequest rreq,
WeblogEntryData wd,
CommentData cd,
- UserData user,
+ WebsiteData website,
List comments) throws MalformedURLException
{
RollerContext rc = RollerContext.getRollerContext(request);
@@ -341,7 +339,7 @@
try
{
userMgr = RollerContext.getRoller(request).getUserManager();
- site = userMgr.getWebsite(user.getUserName());
+ site = wd.getWebsite();
}
catch (RollerException re)
{
@@ -366,7 +364,7 @@
String from =
(StringUtils.isEmpty(site.getEmailFromAddress()))
- ? user.getEmailAddress()
+ ? website.getEmailAddress()
: site.getEmailFromAddress();
//------------------------------------------
@@ -442,7 +440,7 @@
StringBuffer commentURL = new StringBuffer(rootURL);
commentURL.append("/comments/");
- commentURL.append(rreq.getUser().getUserName());
+ commentURL.append(site.getHandle());
PageData page = rreq.getPage();
if (page == null)
@@ -490,7 +488,7 @@
String subject = null;
if ((subscribers.size() > 1) ||
- (StringUtils.equals(cd.getEmail(), user.getEmailAddress())))
+ (StringUtils.equals(cd.getEmail(), website.getEmailAddress())))
{
subject= "RE: "+resources.getString("email.comment.title")+": ";
}
@@ -512,7 +510,7 @@
{
// Send separate messages to owner and commenters
sendMessage(session, from,
- new String[]{user.getEmailAddress()}, null, null, subject, ownermsg.toString(), isHtml);
+ new String[]{website.getEmailAddress()}, null, null, subject, ownermsg.toString(), isHtml);
if (commenterAddrs.length > 0)
{
// If hiding commenter addrs, they go in Bcc: otherwise in the To: of the second message
@@ -527,7 +525,7 @@
// Single message. User in To: header, commenters in either cc or bcc depending on hiding option
String[] cc = hideCommenterAddrs ? null : commenterAddrs;
String[] bcc = hideCommenterAddrs ? commenterAddrs : null;
- sendMessage(session, from, new String[]{user.getEmailAddress()}, cc, bcc, subject,
+ sendMessage(session, from, new String[]{website.getEmailAddress()}, cc, bcc, subject,
ownermsg.toString(), isHtml);
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java Thu Jun 23 21:31:43 2005
@@ -95,16 +95,12 @@
pageHelper.initializePlugins(mPagePlugins);
ctx.put("pageHelper", pageHelper );
- // Add legacy macros too, so that old-school pages still work
- Macros macros= new Macros(rreq.getPageContext(), pageHelper);
- ctx.put("macros", macros);
-
// Load standard Roller objects and values into the context
- String userName = loadWebsiteValues(ctx, rreq, rollerCtx );
- loadWeblogValues( ctx, rreq, rollerCtx, userName );
- loadPathValues( ctx, rreq, rollerCtx, userName );
- loadRssValues( ctx, rreq, userName );
- loadUtilityObjects( ctx, rreq, rollerCtx, userName );
+ String handle = loadWebsiteValues(ctx, rreq, rollerCtx );
+ loadWeblogValues( ctx, rreq, rollerCtx, handle );
+ loadPathValues( ctx, rreq, rollerCtx, handle );
+ loadRssValues( ctx, rreq, handle );
+ loadUtilityObjects( ctx, rreq, rollerCtx, handle );
loadRequestParamKeys(ctx);
loadStatusMessage( ctx, rreq );
@@ -156,11 +152,12 @@
* @param userName
*/
private static void loadWeblogValues(
- Context ctx, RollerRequest rreq, RollerContext rollerCtx, String userName)
+ Context ctx, RollerRequest rreq, RollerContext rollerCtx, String handle)
throws RollerException
{
// if there is an "_entry" page, only load it once
- WebsiteData website = rreq.getRoller().getUserManager().getWebsite(userName);
+ WebsiteData website =
+ rreq.getRoller().getUserManager().getWebsiteByHandle(handle);
PageModel pageModel = (PageModel)ctx.get("pageModel");
if (website != null && pageModel != null)
{
@@ -327,7 +324,7 @@
//------------------------------------------------------------------------
protected static void loadRssValues(
- Context ctx, RollerRequest rreq, String userName) throws RollerException
+ Context ctx, RollerRequest rreq, String handle) throws RollerException
{
HttpServletRequest request = rreq.getRequest();
@@ -372,7 +369,7 @@
//------------------------------------------------------------------------
protected static void loadUtilityObjects(
- Context ctx, RollerRequest rreq, RollerContext rollerCtx, String username)
+ Context ctx, RollerRequest rreq, RollerContext rollerCtx, String handle)
throws RollerException
{
@@ -381,7 +378,7 @@
// in the macro's
Locale viewLocale = (Locale) ctx.get("viewLocale");
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", viewLocale);
- WebsiteData website = rreq.getRoller().getUserManager().getWebsite(username);
+ WebsiteData website = rreq.getWebsite();
if (website != null)
{
sdf.setTimeZone(website.getTimeZoneInstance());
@@ -411,33 +408,31 @@
Context ctx, RollerRequest rreq, RollerContext rollerCtx )
throws RollerException
{
- String userName = null;
- UserData user = null;
+ String handle = null;
WebsiteData website = null;
Roller mRoller = RollerFactory.getRoller();
Map props = mRoller.getPropertiesManager().getProperties();
- if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_USER) != null)
+ if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE) != null)
{
- user = (UserData)
- rreq.getRequest().getAttribute(RollerRequest.OWNING_USER);
+ website = (WebsiteData)
+ rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE);
}
- else if ( rreq.getUser() != null )
+ else if ( rreq.getWebsite() != null )
{
- user = rreq.getUser();
+ website = rreq.getWebsite();
}
- if ( user != null )
+ if ( website != null )
{
- userName = user.getUserName();
- website = rreq.getRoller().getUserManager().getWebsite(userName);
- ctx.put("userName", user.getUserName() );
- ctx.put("fullName", user.getFullName() );
- ctx.put("emailAddress", user.getEmailAddress() );
+ handle = website.getHandle();
+ ctx.put("userName", handle);
+ ctx.put("fullName", website.getName() );
+ ctx.put("emailAddress", website.getEmailAddress() );
- ctx.put("encodedEmail", RegexUtil.encode(user.getEmailAddress()));
- ctx.put("obfuscatedEmail", RegexUtil.obfuscateEmail(user.getEmailAddress()));
+ ctx.put("encodedEmail", RegexUtil.encode(website.getEmailAddress()));
+ ctx.put("obfuscatedEmail", RegexUtil.obfuscateEmail(website.getEmailAddress()));
// setup Locale for future rendering
ctx.put("locale", website.getLocaleInstance());
@@ -451,8 +446,8 @@
website.setName(((RollerPropertyData)props.get("site.name")).getValue());
website.setAllowComments(Boolean.FALSE);
website.setDescription(((RollerPropertyData)props.get("site.description")).getValue());
- userName = "zzz_none_zzz";
- ctx.put("userName",userName );
+ handle = "zzz_none_zzz";
+ ctx.put("userName", handle );
ctx.put("fullName","zzz_none_zzz");
ctx.put("emailAddress",
((RollerPropertyData)props.get("site.adminemail")).getValue());
@@ -471,7 +466,7 @@
LanguageUtil.getViewLocale(rreq.getRequest()));
mLogger.debug("context viewLocale = "+ctx.get( "viewLocale"));
- return userName;
+ return handle;
}
//------------------------------------------------------------------------
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ExportRss.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ExportRss.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ExportRss.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ExportRss.java Thu Jun 23 21:31:43 2005
@@ -1 +1 @@
-package org.roller.presentation.velocity;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.roller.RollerException;
import org.roller.model.RollerFactory;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerContext;
import org.roller.util.RegexUtil;
import org.roller.util.StringUtils;
import org.roller.util.Utilities;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
import java.util.TimeZone;
/**
* Does a lot of the same work as ContextLoader in preparing
* a VelocityContext for parsing. However, it is ignorant of
* any HttpServletRequest related features, and so has
* considerably trimmed down information.
*
* Created on Mar 25, 2004
* @author lance.lavandowska
*/
public class ExportRss
{
private VelocityEngine ve = null;
private VelocityContext ctx = null;
private UserData user = null;
private boolean exportAtom;
private static final String RSS_TEMPLATE = "org/roller/presentation/velocity/export_rss.vm";
private static final String ATOM_TEMPLATE = "org/roller/presentation/velocity/export_atom.vm";
public ExportRss(WebsiteData website) throws Exception
{
Properties props = new Properties();
props.load(RollerContext.getServletContext().
getResourceAsStream("/WEB-INF/velocity.properties"));
ve = new VelocityEngine();
ve.info("*******************************************");
ve.info("Initializing VelocityEngine for ExportRss");
ve.init( props );
ve.info("Done initializing VelocityEngine for ExportRss");
ve.info("************************************************");
ctx = new VelocityContext();
user = website.getUser();
RollerContext rollerCtx = RollerContext.getRollerContext(
RollerContext.getServletContext());
loadPageHelper();
loadDates(website);
loadWebsiteInfo(rollerCtx, website);
loadTheRest(rollerCtx);
}
public void setExportAtom(boolean atom)
{
exportAtom = atom;
}
/**
* Export the given entries using export_rss.vm.
*
* @param entries
* @throws ResourceNotFoundException
* @throws ParseErrorException
* @throws Exception
*/
public void exportEntries(Collection entries, String fileName) throws ResourceNotFoundException, ParseErrorException, Exception
{
ctx.put("entries", entries);
String templateFile = RSS_TEMPLATE;
if (exportAtom) templateFile = ATOM_TEMPLATE;
Template template = ve.getTemplate( templateFile, "utf-8" );
StringWriter sw = new StringWriter();
template.merge(ctx, sw);
writeResultsToFile((String)ctx.get("uploadPath"), sw, fileName);
}
/**
* @param sw
*/
private void writeResultsToFile(String filePath, StringWriter sw, String fileName)
throws RollerException, IOException
{
filePath += "/" + user.getUserName();
new java.io.File( filePath ).mkdirs(); // create dir path on drive
filePath += "/" + fileName;
File outputFile = new java.io.File( filePath );
FileOutputStream out = null;
try
{
//outputFile.createNewFile();
out = new FileOutputStream( outputFile );
out.write( sw.toString().getBytes() );
out.flush();
}
catch ( FileNotFoundException e )
{
throw new RollerException( "Unable to write to: " + outputFile.getAbsolutePath(), e );
}
finally
{
try
{
if ( out != null )
{
out.close();
}
}
catch ( java.io.IOException ioe )
{
System.err.println( "ExportRss unable to close OutputStream" );
}
}
}
/**
* Load miscellaneous values into the Context.
* @param rollerCtx
*/
private void loadTheRest(RollerContext rollerCtx)
{
ctx.put("utilities", new Utilities() );
ctx.put("stringUtils", new StringUtils() );
ctx.put("entryLength", new Integer(-1));
}
/**
* Load information pertaining to the Website and
* its associated User.
* @param rollerCtx
*/
private void loadWebsiteInfo(RollerContext rollerCtx, WebsiteData website)
{
ctx.put("website", website);
ctx.put("userName", user.getUserName() );
ctx.put("fullName", user.getFullName() );
ctx.put("emailAddress", user.getEmailAddress() );
ctx.put("encodedEmail", RegexUtil.encode(user.getEmailAddress()));
ctx.put("obfuscatedEmail", RegexUtil.obfuscateEmail(user.getEmailAddress()));
// custom figureResourcePath() due to no "request" object
StringBuffer sb = new StringBuffer();
String uploadDir = null;
try {
uploadDir = RollerFactory.getRoller().getFileManager().getUploadDir();
} catch(Exception e) {}
ctx.put("uploadPath", uploadDir);
}
/**
* Load time-related information.
* @param website
*/
private void loadDates(WebsiteData website)
{
try
{
// Add current time and last updated times to context
Date updateTime = RollerFactory.getRoller().getWeblogManager()
.getWeblogLastPublishTime( user.getUserName(), null );
ctx.put("updateTime", updateTime);
}
catch (RollerException e)
{
ctx.put("updateTime", new Date());
}
ctx.put("now", new Date());
// setup Locale for future rendering
Locale locale = website.getLocaleInstance();
ctx.put("locale", locale);
// setup Timezone for future rendering
ctx.put("timezone", website.getTimeZoneInstance());
// date formats need to be run through the Localized
// SimpleDateFormat and pulled back out as localized patterns.
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", locale);
sdf.setTimeZone( (TimeZone)ctx.get("timezone") );
ctx.put("plainFormat", sdf.toLocalizedPattern());
sdf.applyPattern("EEEE MMMM dd, yyyy");
ctx.put("toStringFormat", sdf.toLocalizedPattern());
sdf.applyPattern("MMM dd yyyy, hh:mm:ss a z");
ctx.put("timestampFormat", sdf.toLocalizedPattern());
ctx.put("dateFormatter", sdf );
}
/**
* Create a PageHelper. Note that will have no values
* necessary in parsing a Web request (such as /page) -
* it is only useful for the restricted export_rss.vm
* and has no PagePlugins either. We want the exported
* Entry.text to be the raw values.
*/
private void loadPageHelper()
{
// Add Velocity page helper to context
PageHelper pageHelper = new PageHelper(null, null, ctx);
// set no PagePlugins - we *do not* want to render them.
ctx.put("pageHelper", pageHelper );
}
}
\ No newline at end of file
+package org.roller.presentation.velocity;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.roller.RollerException;
import org.roller.model.RollerFactory;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerContext;
import org.roller.util.RegexUtil;
import org.roller.util.StringUtils;
import org.roller.util.Utilities;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
import java.util.TimeZone;
/**
* Does a lot of the same work as ContextLoader in preparing
* a VelocityContext for parsing. However, it is ignorant of
* any HttpServletRequest related features, and so has
* considerably trimmed down information.
*
* Created on Mar 25, 2004
* @author lance.lavandowska
*/
public class ExportRss
{
private VelocityEngine ve = null;
private VelocityContext ctx = null;
private UserData user = null;
private boolean exportAtom;
private static final String RSS_TEMPLATE = "org/roller/presentation/velocity/export_rss.vm";
private static final String ATOM_TEMPLATE = "org/roller/presentation/velocity/export_atom.vm";
public ExportRss(WebsiteData website) throws Exception
{
Properties props = new Properties();
props.load(RollerContext.getServletContext().
getResourceAsStream("/WEB-INF/velocity.properties"));
ve = new VelocityEngine();
ve.info("*******************************************");
ve.info("Initializing VelocityEngine for ExportRss");
ve.init( props );
ve.info("Done initializing VelocityEngine for ExportRss");
ve.info("************************************************");
ctx = new VelocityContext();
RollerContext rollerCtx = RollerContext.getRollerContext(
RollerContext.getServletContext());
loadPageHelper();
loadDates(website);
loadWebsiteInfo(rollerCtx, website);
loadTheRest(rollerCtx);
}
public void setExportAtom(boolean atom)
{
exportAtom = atom;
}
/**
* Export the given entries using export_rss.vm.
*
* @param entries
* @throws ResourceNotFoundException
* @throws ParseErrorException
* @throws Exception
*/
public void exportEntries(Collection entries, String fileName) throws ResourceNotFoundException, ParseErrorException, Exception
{
ctx.put("entries", entries);
String templateFile = RSS_TEMPLATE;
if (exportAtom) templateFile = ATOM_TEMPLATE;
Template template = ve.getTemplate( templateFile, "utf-8" );
StringWriter sw = new StringWriter();
template.merge(ctx, sw);
writeResultsToFile((String)ctx.get("uploadPath"), sw, fileName);
}
/**
* @param sw
*/
private void writeResultsToFile(String filePath, StringWriter sw, String fileName)
throws RollerException, IOException
{
filePath += "/" + user.getUserName();
new java.io.File( filePath ).mkdirs(); // create dir path on drive
filePath += "/" + fileName;
File outputFile = new java.io.File( filePath );
FileOutputStream out = null;
try
{
//outputFile.createNewFile();
out = new FileOutputStream( outputFile );
out.write( sw.toString().getBytes() );
out.flush();
}
catch ( FileNotFoundException e )
{
throw new RollerException( "Unable to write to: " + outputFile.getAbsolutePath(), e );
}
finally
{
try
{
if ( out != null )
{
out.close();
}
}
catch ( java.io.IOException ioe )
{
System.err.println( "ExportRss unable to close OutputStream" );
}
}
}
/**
* Load miscellaneous values into the Context.
* @param rollerCtx
*/
private void loadTheRest(RollerContext rollerCtx)
{
ctx.put("utilities", new Utilities() );
ctx.put("stringUtils", new StringUtils() );
ctx.put("entryLength", new Integer(-1));
}
/**
* Load information pertaining to the Website and
* its associated User.
* @param rollerCtx
*/
private void loadWebsiteInfo(RollerContext rollerCtx, WebsiteData website)
{
ctx.put("website", website);
ctx.put("userName", user.getUserName() );
ctx.put("fullName", user.getFullName() );
ctx.put("emailAddress", user.getEmailAddress() );
ctx.put("encodedEmail", RegexUtil.encode(user.getEmailAddress()));
ctx.put("obfuscatedEmail", RegexUtil.obfuscateEmail(user.getEmailAddress()));
// custom figureResourcePath() due to no "request" object
StringBuffer sb = new StringBuffer();
String uploadDir = null;
try {
uploadDir = RollerFactory.getRoller().getFileManager().getUploadDir();
} catch(Exception e) {}
ctx.put("uploadPath", uploadDir);
}
/**
* Load time-related information.
* @param website
*/
private void loadDates(WebsiteData website)
{
try
{
// Add current time and last updated times to context
Date updateTime = RollerFactory.getRoller().getWeblogManager()
.getWeblogLastPublishTime(website, null);
ctx.put("updateTime", updateTime);
}
catch (RollerException e)
{
ctx.put("updateTime", new Date());
}
ctx.put("now", new Date());
// setup Locale for future rendering
Locale locale = website.getLocaleInstance();
ctx.put("locale", locale);
// setup Timezone for future rendering
ctx.put("timezone", website.getTimeZoneInstance());
// date formats need to be run through the Localized
// SimpleDateFormat and pulled back out as localized patterns.
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", locale);
sdf.setTimeZone( (TimeZone)ctx.get("timezone") );
ctx.put("plainFormat", sdf.toLocalizedPattern());
sdf.applyPattern("EEEE MMMM dd, yyyy");
ctx.put("toStringFormat", sdf.toLocalizedPattern());
sdf.applyPattern("MMM dd yyyy, hh:mm:ss a z");
ctx.put("timestampFormat", sdf.toLocalizedPattern());
ctx.put("dateFormatter", sdf );
}
/**
* Create a PageHelper. Note that will have no values
* necessary in parsing a Web request (such as /page) -
* it is only useful for the restricted export_rss.vm
* and has no PagePlugins either. We want the exported
* Entry.text to be the raw values.
*/
private void loadPageHelper()
{
// Add Velocity page helper to context
PageHelper pageHelper = new PageHelper(null, null, ctx);
// set no PagePlugins - we *do not* want to render them.
ctx.put("pageHelper", pageHelper );
}
}
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FoafServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FoafServlet.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FoafServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FoafServlet.java Thu Jun 23 21:31:43 2005
@@ -1,2 +1 @@
-package org.roller.presentation.velocity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.servlet.VelocityServlet;
import org.roller.RollerException;
import org.roller.model.UserManager;
import org.roller.pojos.PageData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
import org.roller.util.Utilities;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
//////////////////////////////////////////////////////////////////////////////
/**
* <p>Responsible for rendering FOAF feed. This servlet requires
* that the RequestFilter is in place for it, and should also
* have the IfModifiedFilter configured.</p>
*
* <p>Resources:<br />
* <a href="http://xmlns.com/foaf/0.1/"
* >FOAF Vocabulary Specification</a><br />
* <a href="http://www.xml.com/lpt/a/2004/02/04/foaf.html"
* >An Introduction to FOAF</a></p>
*
* <p>FOAF Autodiscovery: <br />
* <link rel="meta" type="application/rdf+xml" title="FOAF"
* href="$absBaseURL/foaf/$userName" /> </p>
*
* @author Lance Lavandowska
*
* @web.servlet name="FoafServlet"
* @web.servlet-mapping url-pattern="/foaf/*"
*/
public class FoafServlet extends VelocityServlet
{
static final long serialVersionUID = -1893244416537298619L;
private static Log mLogger = LogFactory.getFactory()
.getInstance(RollerRequest.class);
/**
* This Velocity servlet does not make use of ContextLoader and associated
* classes (as do FlavorServlet and PageServlet) because that is more
* work than is really necessary. It implements its own setupContext()
* to load necessary values into the Velocity Context.
*
* @param ctx
* @param rreq
* @throws RollerException
*/
public Template handleRequest(HttpServletRequest request,
HttpServletResponse response, Context ctx)
{
RollerRequest rreq = null;
try
{
rreq = RollerRequest.getRollerRequest(request, getServletContext());
}
catch (RollerException e)
{
// An error initializing the request is considered to be a 404
if (mLogger.isDebugEnabled())
{
mLogger.debug("RollerRequest threw Exception", e);
}
try
{
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
catch (IOException e1)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("IOException sending error", e);
}
}
return null;
}
try
{
setupContext(ctx, rreq);
response.setContentType("application/rdf+xml");
return getTemplate("/flavors/foaf.vm");
}
catch (Exception e)
{
mLogger.error("ERROR in FoafServlet", e);
}
return null;
}
/**
* @param ctx
*/
private void setupContext(Context ctx, RollerRequest rreq) throws RollerException
{
HttpServletRequest request = rreq.getRequest();
RollerContext rollerCtx = RollerContext.getRollerContext( request );
UserData user = rreq.getUser();
- ctx.put("fullName", user.getFullName()); // name for FlavorServlet compatibility
// foaf:homepage to equal base URL for user
String homepage = Utilities.escapeHTML(
rollerCtx.getAbsoluteContextUrl(request) +
"/page/" + rreq.getUser().getUserName() );
ctx.put("websiteURL", homepage); // name for FlavorServlet compatibility
// see if foaf:weblog is different Page
WebsiteData website = rreq.getWebsite();
UserManager usrMgr = RollerContext.getRoller(request).getUserManager();
PageData weblog = usrMgr.getPageByName(website, "Weblog");
// if weblog != homepage, add to context
if (weblog != null && !website.getDefaultPageId().equals(weblog.getId()))
{
String weblogUrl = Utilities.escapeHTML(
rollerCtx.getAbsoluteContextUrl(request) +
"/page/" + rreq.getUser().getUserName() +
"/" + weblog.getLink() );
ctx.put("weblog", weblogUrl);
}
// use SHA1 encrypted email address, including mailto: prefix
String shaEmail = Utilities.encodePassword(
"mailto:" + user.getEmailAddress(), "SHA");
ctx.put("shaEmail", shaEmail);
}
//------------------------------------------------------------------------
/**
* Handle error in Velocity processing.
*/
protected void error( HttpServletRequest req, HttpServletResponse res,
Exception e) throws ServletException, IOException
{
mLogger.warn("ERROR in FoafServlet",e);
}
}
\ No newline at end of file
+package org.roller.presentation.velocity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.servlet.VelocityServlet;
import org.roller.RollerException;
import org.roller.model.UserManager;
import org.roller.pojos.PageData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
import org.roller.util.Utilities;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
//////////////////////////////////////////////////////////////////////////////
/**
* <p>Responsible for rendering FOAF feed. This servlet requires
* that the RequestFilter is in place for it, and should also
* have the IfModifiedFilter configured.</p>
*
* <p>Resources:<br />
* <a href="http://xmlns.com/foaf/0.1/"
* >FOAF Vocabulary Specification</a><br />
* <a href="http://www.xml.com/lpt/a/2004/02/04/foaf.html"
* >An Introduction to FOAF</a></p>
*
* <p>FOAF Autodiscovery: <br />
* <link rel="meta" type="application/rdf+xml" title="FOAF"
* href="$absBaseURL/foaf/$userName" /> </p>
*
* @author Lance Lavandowska
*
* @web.servlet name="FoafServlet"
* @web.servlet-mapping url-pattern="/foaf/*"
*/
public class FoafServlet extends VelocityServlet
{
static final long serialVersionUID = -1893244416537298619L;
private static Log mLogger = LogFactory.getFactory()
.getInstance(RollerRequest.class);
/**
* This Velocity servlet does not make use of ContextLoader and associated
* classes (as do FlavorServlet and PageServlet) because that is more
* work than is really necessary. It implements its own setupContext()
* to load necessary values into the Velocity Context.
*
* @param ctx
* @param rreq
* @throws RollerException
*/
public Template handleRequest(HttpServletRequest request,
HttpServletResponse response, Context ctx)
{
RollerRequest rreq = null;
try
{
rreq = RollerRequest.getRollerRequest(request, getServletContext());
}
catch (RollerException e)
{
// An error initializing the request is considered to be a 404
if (mLogger.isDebugEnabled())
{
mLogger.debug("RollerRequest threw Exception", e);
}
try
{
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
catch (IOException e1)
{
if (mLogger.isDebugEnabled())
{
mLogger.debug("IOException sending error", e);
}
}
return null;
}
try
{
setupContext(ctx, rreq);
response.setContentType("application/rdf+xml");
return getTemplate("/flavors/foaf.vm");
}
catch (Exception e)
{
mLogger.error("ERROR in FoafServlet", e);
}
return null;
}
/**
* @param ctx
*/
private void setupContext(Context ctx, RollerRequest rreq) throws RollerException
{
HttpServletRequest request = rreq.getRequest();
RollerContext rollerCtx = RollerContext.getRollerContext( request );
WebsiteData website = rreq.getWebsite();
ctx.put("fullName", website.getName()); // name for FlavorServlet compatibility
// foaf:homepage to equal base URL for user
String homepage = Utilities.escapeHTML(
rollerCtx.getAbsoluteContextUrl(request) +
"/page/" + website.getHandle() );
ctx.put("websiteURL", homepage); // name for FlavorServlet compatibility
// see if foaf:weblog is different Page
UserManager usrMgr = RollerContext.getRoller(request).getUserManager();
PageData weblog = usrMgr.getPageByName(website, "Weblog");
// if weblog != homepage, add to context
if (weblog != null && !website.getDefaultPageId().equals(weblog.getId()))
{
String weblogUrl = Utilities.escapeHTML(
rollerCtx.getAbsoluteContextUrl(request) +
"/page/" + website.getHandle() +
"/" + weblog.getLink() );
ctx.put("weblog", weblogUrl);
}
// use SHA1 encrypted email address, including mailto: prefix
String shaEmail = Utilities.encodePassword(
"mailto:" + website.getEmailAddress(), "SHA");
ctx.put("shaEmail", shaEmail);
}
//------------------------------------------------------------------------
/**
* Handle error in Velocity processing.
*/
protected void error( HttpServletRequest req, HttpServletResponse res,
Exception e) throws ServletException, IOException
{
mLogger.warn("ERROR in FoafServlet",e);
}
}
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java Thu Jun 23 21:31:43 2005
@@ -1,5 +1,19 @@
package org.roller.presentation.velocity;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
@@ -9,8 +23,8 @@
import org.apache.velocity.context.Context;
import org.roller.RollerException;
import org.roller.pojos.RefererData;
-import org.roller.pojos.UserData;
import org.roller.pojos.WeblogEntryData;
+import org.roller.pojos.WebsiteData;
import org.roller.presentation.LanguageUtil;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
@@ -22,20 +36,6 @@
import org.roller.presentation.weblog.tags.WeblogCalendarModel;
import org.roller.util.StringUtils;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
/**
* Provides assistance to VelociMacros, filling in where Velocity falls.
*
@@ -52,9 +52,9 @@
private PageContext mPageContext = null;
private HttpServletResponse mResponse = null;
private RollerRequest mRollerReq = null;
- private String mUsername = null;
private Collection mPagePlugins = new ArrayList();
private boolean mSkipFlag = false;
+ private WebsiteData mWebsite = null;
//------------------------------------------------------------------------
@@ -71,19 +71,15 @@
if (rreq != null)
{
mPageContext = rreq.getPageContext();
- UserData user = null;
- if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_USER) != null)
+ WebsiteData website = null;
+ if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE) != null)
{
- user = (UserData)
- rreq.getRequest().getAttribute(RollerRequest.OWNING_USER);
+ website = (WebsiteData)
+ rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE);
}
- else if ( rreq.getUser() != null )
+ else if ( rreq.getWebsite() != null )
{
- user = rreq.getUser();
- }
- if ( user != null )
- {
- mUsername = user.getUserName();
+ website = rreq.getWebsite();
}
}
@@ -195,9 +191,9 @@
Hashtable params = new Hashtable();
params.put( RollerRequest.WEBLOGENTRYID_KEY, entry.getId());
params.put( RollerRequest.ANCHOR_KEY, entry.getAnchor());
- if (mUsername != null)
+ if (mWebsite != null)
{
- params.put( RollerRequest.USERNAME_KEY, mUsername);
+ params.put( RollerRequest.USERNAME_KEY, mWebsite.getHandle());
}
try
{
@@ -223,7 +219,7 @@
{
Hashtable params = new Hashtable();
params.put( RollerRequest.REFERERID_KEY, referer.getId());
- params.put( RollerRequest.USERNAME_KEY, mUsername);
+ params.put( RollerRequest.USERNAME_KEY, mWebsite.getHandle());
link = RequestUtils.computeURL( mPageContext,
"toggleLinkback", null, null, null, params,null,false);
@@ -353,12 +349,12 @@
String pageLink = mRollerReq.getPageLink();
if ( pageLink != null )
{
- selfUrl =
- request.getContextPath()+"/page/"+mUsername+"/"+pageLink;
+ selfUrl = request.getContextPath() + "/page/"
+ + mWebsite.getHandle() + "/"+pageLink;
}
else
{
- selfUrl = request.getContextPath()+"/page/"+mUsername;
+ selfUrl = request.getContextPath()+"/page/" + mWebsite.getHandle();
}
// setup weblog calendar model
@@ -438,9 +434,9 @@
params.put(RollerRequest.FOLDERID_KEY,
mRollerReq.getFolder().getId());
}
- if (mUsername != null)
+ if (mWebsite != null)
{
- params.put(RollerRequest.USERNAME_KEY, mUsername);
+ params.put(RollerRequest.WEBSITEHANDLE_KEY, mWebsite.getHandle());
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java Thu Jun 23 21:31:43 2005
@@ -46,17 +46,18 @@
private UserManager mUserMgr = null;
private RefererManager mRefererMgr = null;
- private Map mCategories = new HashMap();
+ private Map mCategories = new HashMap();
private HashMap mPageMap = new HashMap();
private RollerRequest mRollerReq = null;
- private String mUsername = null;
+ private String mHandle = null;
+ private WebsiteData mWebsite = null;
private WeblogEntryData mNextEntry = null;
private WeblogEntryData mPreviousEntry = null;
private WeblogEntryData mLastEntry = null;
- private WeblogEntryData mFirstEntry;
+ private WeblogEntryData mFirstEntry;
//------------------------------------------------------------------------
@@ -71,20 +72,16 @@
public void init(RollerRequest rreq)
{
mRollerReq = rreq;
- UserData user = null;
- if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_USER) != null)
+ if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE) != null)
{
- user = (UserData)
- rreq.getRequest().getAttribute(RollerRequest.OWNING_USER);
+ mWebsite = (WebsiteData)
+ rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE);
}
- else if ( rreq.getUser() != null )
+ else if ( rreq.getWebsite() != null )
{
- user = rreq.getUser();
- }
- if ( user != null )
- {
- mUsername = user.getUserName();
+ mWebsite = rreq.getWebsite();
}
+ mHandle = mWebsite.getHandle();
try
{
@@ -92,24 +89,18 @@
mRefererMgr = rreq.getRoller().getRefererManager();
mUserMgr = rreq.getRoller().getUserManager();
mWeblogMgr = rreq.getRoller().getWeblogManager();
-
- /**
- * Preload what we can for encapsulation. What we cannot preload we
- * will use the Managers later to fetch.
- */
- if ( mUsername != null )
- {
- // Get the pages, put into context & load map
- WebsiteData website = mUserMgr.getWebsite(user.getUserName());
- List pages = mUserMgr.getPages(website);
- Iterator pageIter = pages.iterator();
- while (pageIter.hasNext())
- {
- PageData page = (PageData) pageIter.next();
- mPageMap.put(page.getName(), page);
- }
+
+ // Preload what we can for encapsulation. What we cannot preload we
+ // will use the Managers later to fetch.
+
+ // Get the pages, put into context & load map
+ List pages = mUserMgr.getPages(mWebsite);
+ Iterator pageIter = pages.iterator();
+ while (pageIter.hasNext())
+ {
+ PageData page = (PageData) pageIter.next();
+ mPageMap.put(page.getName(), page);
}
-
}
catch (RollerException e)
{
@@ -136,8 +127,8 @@
Collection tops = null;
try
{
- tops= mBookmarkMgr.getRootFolder(
- mUserMgr.getWebsite(mUsername)).getFolders();
+ tops = mBookmarkMgr.getRootFolder(
+ mUserMgr.getWebsiteByHandle(mHandle)).getFolders();
}
catch (RollerException e)
{
@@ -202,7 +193,7 @@
try
{
return mBookmarkMgr.getFolder(
- mUserMgr.getWebsite(mUsername), folderPath);
+ mUserMgr.getWebsiteByHandle(mHandle), folderPath);
}
catch (RollerException e)
{
@@ -669,8 +660,7 @@
{
try
{
- return mBookmarkMgr.getFolderByPath(
- mUserMgr.getWebsite(mUsername), null, path);
+ return mBookmarkMgr.getFolderByPath(mWebsite, null, path);
}
catch (RollerException e)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java Thu Jun 23 21:31:43 2005
@@ -91,7 +91,7 @@
return generalSearchResults(request, response, ctx);
}
- boolean userSpecificSearch = checkForUser(request);
+ boolean websiteSpecificSearch = checkForWebsite(request);
try
{
RollerRequest rreq = getRollerRequest(request, response);
@@ -102,11 +102,11 @@
ctx.put("term", request.getParameter("q"));
WebsiteData website = null;
- if (userSpecificSearch)
+ if (websiteSpecificSearch)
{
website = rreq.getWebsite();
- search.setUsername(rreq.getUser().getUserName());
- ctx.put("username", rreq.getUser().getUserName());
+ search.setWebsiteHandle(rreq.getWebsite().getHandle());
+ ctx.put("websiteHandle", rreq.getWebsite().getHandle());
}
if (StringUtils.isNotEmpty(request.getParameter("c")))
@@ -151,7 +151,7 @@
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
- if (userSpecificSearch)
+ if (websiteSpecificSearch)
{
return super.handleRequest(request, response, ctx);
}
@@ -198,7 +198,7 @@
rreq.getRequest().setAttribute("limit", new Integer(limit));
if (offset + limit > hits.length()) limit = hits.length()-offset;
- boolean userSpecificSearch = checkForUser(rreq.getRequest());
+ boolean websiteSpecificSearch = checkForWebsite(rreq.getRequest());
TreeMap searchResults = new TreeMap(new ReverseComparator());
TreeSet categories = new TreeSet();
UserManager userMgr =
@@ -207,19 +207,18 @@
RollerContext.getRoller(rreq.getRequest()).getWeblogManager();
WeblogEntryData entry;
Document doc = null;
- String username = null;
+ String handle = null;
for (int i = offset; i < offset+limit; i++)
{
entry = null; // reset for each iteration
doc = hits.doc(i);
- username =
- doc.getField(FieldConstants.USERNAME).stringValue();
+ handle = doc.getField(FieldConstants.WEBSITE_HANDLE).stringValue();
- if (userSpecificSearch && website != null)
+ if (websiteSpecificSearch && website != null)
{
// "wrong user" results have been reported
- if (username.equals(rreq.getUser().getUserName()))
+ if (handle.equals(rreq.getWebsite().getHandle()))
{
//entry = buildSearchEntry(website, doc);
@@ -230,7 +229,7 @@
}
else
{
- website = userMgr.getWebsite(username);
+ website = entry.getWebsite();
// if user is not enabled, website will be null
if (website != null)
{
@@ -396,10 +395,10 @@
* @param request
* @return
*/
- private boolean checkForUser(HttpServletRequest request)
+ private boolean checkForWebsite(HttpServletRequest request)
{
if (StringUtils.isNotEmpty(
- request.getParameter(RollerRequest.USERNAME_KEY)))
+ request.getParameter(RollerRequest.WEBSITEHANDLE_KEY)))
{
return true;
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java Thu Jun 23 21:31:43 2005
@@ -271,7 +271,7 @@
JspFactory.getDefaultFactory().getPageContext(
this.getServlet(), request, response, "", true, 8192, true);
Map params = new HashMap();
- params.put( RollerRequest.USERNAME_KEY, rreq.getUser().getUserName());
+ params.put( RollerRequest.WEBSITEHANDLE_KEY, rreq.getWebsite().getHandle());
params.put("rmik", "Files");
String filesLink = RequestUtils.computeURL(
pageContext, (String)null, (String)null, (String)null,
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java Thu Jun 23 21:31:43 2005
@@ -20,7 +20,7 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
-import org.roller.pojos.UserData;
+import org.roller.pojos.WebsiteData;
import org.roller.presentation.MainPageAction;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
@@ -56,17 +56,17 @@
}
else
{
- getXmlFiles(actionForm, rreq);
+ getXmlFiles(actionForm, rreq);
ImportEntriesForm form = (ImportEntriesForm)actionForm;
if (StringUtils.isNotEmpty(form.getImportFileName()))
{
// "default" values
- UserData user = rreq.getUser();
+ WebsiteData website = rreq.getWebsite();
// load selected file
ServletContext app = this.getServlet().getServletConfig().getServletContext();
String dir = RollerContext.getUploadDir( app );
- File f = new File(dir + user.getUserName() +
+ File f = new File(dir + website.getHandle() +
"/" + form.getImportFileName());
//ArchiveParser archiveParser =
@@ -83,7 +83,7 @@
saveMessages(request, notices);
// Flush the page cache
- PageCacheFilter.removeFromCache( request, user );
+ PageCacheFilter.removeFromCache(request, website);
// refresh the front page cache
MainPageAction.flushMainPageCache();
}
@@ -147,7 +147,7 @@
{
ServletContext app = this.getServlet().getServletConfig().getServletContext();
String dir = RollerContext.getUploadDir( app );
- File d = new File(dir + rreq.getUser().getUserName());
+ File d = new File(dir + rreq.getWebsite().getHandle());
ArrayList xmlFiles = new ArrayList();
if (d.mkdirs() || d.exists())
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java Thu Jun 23 21:31:43 2005
@@ -58,9 +58,7 @@
try
{
if ( rreq.isUserAuthorizedToEdit() )
- {
- UserData ud = rreq.getUser();
-
+ {
req.setAttribute("pageHits",
new Integer(refmgr.getDayHits(rreq.getWebsite())));
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java Thu Jun 23 21:31:43 2005
@@ -36,8 +36,6 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(req);
- String userName = rreq.getUser().getUserName();
-
try
{
if ( rreq.isUserAuthorizedToEdit() )
@@ -55,7 +53,7 @@
rreq.getRoller().commit();
- PageCacheFilter.removeFromCache( req, rreq.getUser() );
+ PageCacheFilter.removeFromCache( req, rreq.getWebsite() );
}
}
}
@@ -71,7 +69,7 @@
{
RollerContext rctx = RollerContext.getRollerContext(
rreq.getServletContext());
- url = rctx.getContextUrl( req, userName);
+ url = rctx.getContextUrl( req, rreq.getWebsite());
res.sendRedirect(url);
}
catch (Exception e)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Thu Jun 23 21:31:43 2005
@@ -86,7 +86,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if ( rreq.isUserAuthorizedToEdit() )
+ if (rreq.isUserAuthorizedToEdit())
{
WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
form.initNew(request, response);
@@ -236,8 +236,7 @@
UserManager userMgr = rreq.getRoller().getUserManager();
WeblogManager weblogMgr = rreq.getRoller().getWeblogManager();
- UserData user = rreq.getUser();
- WebsiteData site = userMgr.getWebsite( user.getUserName() );
+ WebsiteData site = rreq.getWebsite();
WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
// I was getting column 'x' cannot be null, so I fixed it here.
@@ -304,7 +303,7 @@
// Flush the page cache
mLogger.debug("Removing from cache");
- PageCacheFilter.removeFromCache(request, user);
+ PageCacheFilter.removeFromCache(request, rreq.getWebsite());
// refresh the front page cache
MainPageAction.flushMainPageCache();
@@ -465,8 +464,7 @@
WeblogEntryData wd = mgr.retrieveWeblogEntry(request.getParameter("id"));
// Flush the page cache
- UserData user = rreq.getUser();
- PageCacheFilter.removeFromCache(request, user);
+ PageCacheFilter.removeFromCache(request, rreq.getWebsite());
// remove the index for it
wd.setPublishEntry(Boolean.FALSE);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java Thu Jun 23 21:31:43 2005
@@ -192,7 +192,7 @@
public UserData getUser()
{
- return rollerRequest.getUser();
+ return rollerRequest.getAuthenticatedUser();
}
public List getCategories() throws Exception
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/RssBadgeTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/RssBadgeTag.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/RssBadgeTag.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/RssBadgeTag.java Thu Jun 23 21:31:43 2005
@@ -1,17 +1,17 @@
package org.roller.presentation.weblog.tags;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.roller.pojos.UserData;
-import org.roller.presentation.RollerRequest;
-
import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.roller.pojos.WebsiteData;
+import org.roller.presentation.RollerRequest;
+
/**
* @jsp.tag name="RssBadge"
*/
@@ -35,17 +35,16 @@
(HttpServletRequest)pageContext.getRequest();
RollerRequest rreq = RollerRequest.getRollerRequest(req);
- UserData ud = rreq.getUser();
-
+ WebsiteData website = rreq.getWebsite();
pw.println(
- "<a href="+"\""+req.getContextPath()+"/rss/"
- +ud.getUserName()+"\">"
- +"<img "+"src=\""+req.getContextPath()+"/images/rssbadge.gif\" "
- +"class=\"rssbadge\" "
- +"alt=\"XML\""
- +"/>"
- +"</a>");
- }
+ "<a href="+"\"" + req.getContextPath() + "/rss/"
+ + website.getHandle() + "\">"
+ + "<img "+"src=\"" + req.getContextPath() + "/images/rssbadge.gif\" "
+ + "class=\"rssbadge\" "
+ + "alt=\"XML\""
+ + "/>"
+ + "</a>");
+ }
catch (Exception e)
{
mLogger.error("Exception",e);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java Thu Jun 23 21:31:43 2005
@@ -21,9 +21,8 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.roller.RollerException;
-import org.roller.business.search.operations.RebuildUserIndexOperation;
import org.roller.model.IndexManager;
-import org.roller.pojos.UserData;
+import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.pagecache.PageCacheFilter;
@@ -74,9 +73,9 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rreq.isUserAuthorizedToEdit() )
{
- UserData ud = rreq.getUser();
+ WebsiteData website = rreq.getWebsite();
IndexManager manager = rreq.getRoller().getIndexManager();
- manager.rebuildUserIndex();
+ manager.rebuildWebsiteIndex(website);
ActionMessages messages = new ActionMessages();
messages.add(null, new ActionMessage("maintenance.message.indexed"));
@@ -112,12 +111,11 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rreq.isUserAuthorizedToEdit() )
{
- UserData user = rreq.getUser();
- PageCacheFilter.removeFromCache(request, user);
+ PageCacheFilter.removeFromCache(request, rreq.getWebsite());
- ActionMessages messages = new ActionMessages();
- messages.add(null, new ActionMessage("maintenance.message.flushed"));
- saveMessages(request, messages);
+ ActionMessages messages = new ActionMessages();
+ messages.add(null, new ActionMessage("maintenance.message.flushed"));
+ saveMessages(request, messages);
}
}
catch (Exception e)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/PageFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/PageFormAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/PageFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/PageFormAction.java Thu Jun 23 21:31:43 2005
@@ -80,8 +80,7 @@
data.getName()));
saveMessages(request, uiMessages);
- UserData user = rreq.getUser();
- PageCacheFilter.removeFromCache( request, user );
+ PageCacheFilter.removeFromCache( request, rreq.getWebsite() );
actionForm.reset(mapping,request);
@@ -114,12 +113,11 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rreq.isUserAuthorizedToEdit() )
{
- UserData ud = rreq.getUser();
PageData pd = rreq.getPage();
PageForm pf = (PageForm)actionForm;
pf.copyFrom(pd, request.getLocale());
- PageCacheFilter.removeFromCache( request,ud );
+ PageCacheFilter.removeFromCache( request, rreq.getWebsite() );
addModelObjects(rreq);
}
@@ -187,8 +185,7 @@
mgr.removePageSafely( data.getId() );
rreq.getRoller().commit();
- UserData user = rreq.getUser();
- PageCacheFilter.removeFromCache( request,user );
+ PageCacheFilter.removeFromCache( request, rreq.getWebsite() );
addModelObjects(rreq);
@@ -232,7 +229,7 @@
PageForm pf = (PageForm)actionForm;
pf.copyFrom(cd, request.getLocale());
- UserData ud = rreq.getUser();
+ UserData ud = rreq.getAuthenticatedUser();
request.setAttribute("user",ud);
}
else
@@ -284,8 +281,7 @@
data.getName()));
saveMessages(request, uiMessages);
- UserData user = rreq.getUser();
- PageCacheFilter.removeFromCache( request,user );
+ PageCacheFilter.removeFromCache(request, rreq.getWebsite());
}
else
{
@@ -359,7 +355,7 @@
UserManager mgr = rreq.getRoller().getUserManager();
- UserData user = rreq.getUser();
+ UserData user = rreq.getAuthenticatedUser();
request.setAttribute("user",user);
WebsiteData wd = rreq.getWebsite();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerConfigAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerConfigAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerConfigAction.java Thu Jun 23 21:31:43 2005
@@ -131,7 +131,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
IndexManager manager = rreq.getRoller().getIndexManager();
- manager.rebuildUserIndex();
+ manager.rebuildWebsiteIndex();
request.getSession().setAttribute(
RollerSession.STATUS_MESSAGE,
"Successfully scheduled rebuild of all users' indexes");
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java Thu Jun 23 21:31:43 2005
@@ -208,7 +208,7 @@
// will be able to find it
PageData page = getDefaultPage( rreq );
PreviewResourceLoader.setTemplate(page.getId(),
- teForm.getThemeTemplate(), rreq.getUser().getUserName() );
+ teForm.getThemeTemplate(), rreq.getWebsite().getHandle() );
// save the template in session for later editing
session.setAttribute(SESSION_TEMPLATE,
@@ -253,12 +253,14 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
if ( rreq.isUserAuthorizedToEdit() )
{
- loadThemes( rreq, errors, true);
- ThemeEditorForm teForm = (ThemeEditorForm)form;
- String theme = teForm.getThemeName();
- ServletContext ctx = rreq.getServletContext();
- RollerContext rollerContext =
+ loadThemes( rreq, errors, true);
+ ThemeEditorForm teForm = (ThemeEditorForm)form;
+ String theme = teForm.getThemeName();
+ ServletContext ctx = rreq.getServletContext();
+ RollerContext rollerContext =
RollerContext.getRollerContext( ctx );
+
+ WebsiteData website = rreq.getWebsite();
// load the template either from the Form
// or from the disk (if its a stock Theme).
@@ -275,11 +277,8 @@
template = sb;
}
- // we'll need the User
- UserData ud = rreq.getUser();
-
// clear the places holding onto the template
- PreviewResourceLoader.clearAllTemplates(ud.getUserName());
+ PreviewResourceLoader.clearAllTemplates(website.getHandle());
request.getSession().removeAttribute(SESSION_TEMPLATE);
// store the template in the page
@@ -295,7 +294,7 @@
setThemePages(rreq, theme);
// clear the page cache
- PageCacheFilter.removeFromCache( request, ud );
+ PageCacheFilter.removeFromCache(request, rreq.getWebsite());
teForm.setThemeName("Custom");
}
else
@@ -337,12 +336,12 @@
if ( rreq.isUserAuthorizedToEdit() )
{
// clear the page cache
- UserData ud = rreq.getUser();
- PageCacheFilter.removeFromCache( request, ud );
- ThemeEditorForm teForm = (ThemeEditorForm)form;
+ WebsiteData website = rreq.getWebsite();
+ PageCacheFilter.removeFromCache( request, website );
+ ThemeEditorForm teForm = (ThemeEditorForm)form;
// clear the places holding onto the template
- PreviewResourceLoader.clearAllTemplates( ud.getUserName() );
+ PreviewResourceLoader.clearAllTemplates( website.getHandle() );
request.getSession().removeAttribute(SESSION_TEMPLATE);
teForm.setThemeName("Custom");
}
@@ -418,9 +417,8 @@
{
try
{
- UserData ud = rreq.getUser();
UserManager mgr = rreq.getRoller().getUserManager();
- WebsiteData wd = mgr.getWebsite( ud.getUserName() );
+ WebsiteData wd = rreq.getWebsite();
String defaultPageId = wd.getDefaultPageId();
return mgr.retrievePage( defaultPageId );
}
@@ -445,26 +443,24 @@
RollerContext.getRollerContext(rreq.getRequest());
try
- {
- UserData ud = rreq.getUser();
- UserManager mgr = rreq.getRoller().getUserManager();
- String username = ud.getUserName();
-
+ {
HashMap pages = rollerContext.readThemeMacros(theme);
Iterator iter = pages.keySet().iterator();
while ( iter.hasNext() )
{
String pageName = (String) iter.next();
String sb = (String)pages.get( pageName );
-
- PageData page = mgr.getPageByName( rreq.getWebsite(), pageName );
+ UserManager umgr = rreq.getRoller().getUserManager();
+ WebsiteData website = rreq.getCurrentWebsite();
+ String handle = website.getHandle();
+ PageData page = umgr.getPageByName( rreq.getWebsite(), pageName );
if (page != null)
{
- PreviewResourceLoader.setTemplate(page.getId(),sb,username);
+ PreviewResourceLoader.setTemplate(page.getId(),sb, handle);
}
else
{
- PreviewResourceLoader.setTemplate(pageName, sb, username);
+ PreviewResourceLoader.setTemplate(pageName, sb, handle);
}
}
}
@@ -498,9 +494,9 @@
try
{
- UserData ud = rreq.getUser();
+ //UserData ud = rreq.getUser();
UserManager mgr = rreq.getRoller().getUserManager();
- String username = ud.getUserName();
+ //String username = ud.getUserName();
String themeDir = rollerContext.getThemePath(theme);
String[] children = RollerContext.getThemeFilenames(themeDir);
@@ -552,10 +548,8 @@
try
{
- UserData ud = rreq.getUser();
UserManager mgr = rreq.getRoller().getUserManager();
- String username = ud.getUserName();
- WebsiteData website = mgr.getWebsite( username );
+ WebsiteData website = rreq.getWebsite();
HashMap pages = rollerContext.readThemeMacros(theme);
Iterator iter = pages.keySet().iterator();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java Thu Jun 23 21:31:43 2005
@@ -53,7 +53,6 @@
{
RollerRequest rreq = null;
ActionForward fwd = mapping.findForward("uploadFiles.page");
- UserData user = null;
WebsiteData website = null;
RollerMessages msgs = new RollerMessages();
try
@@ -64,7 +63,6 @@
return mapping.findForward("access-denied");
}
website = rreq.getWebsite();
- user = website.getUser();
}
catch (Exception e)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=201564&r1=201563&r2=201564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java Thu Jun 23 21:31:43 2005
@@ -16,8 +16,8 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.roller.RollerException;
-import org.roller.business.search.operations.RebuildUserIndexOperation;
-import org.roller.business.search.operations.RemoveUserIndexOperation;
+import org.roller.business.search.operations.RebuildWebsiteIndexOperation;
+import org.roller.business.search.operations.RemoveWebsiteIndexOperation;
import org.roller.model.IndexManager;
import org.roller.model.UserManager;
import org.roller.pojos.UserData;
@@ -75,11 +75,6 @@
// User must set new password twice
userForm.setPasswordText(null);
userForm.setPasswordConfirm(null);
-
- // Join in the website enabled field
- WebsiteData website =
- mgr.getWebsite(userForm.getUserName(), false);
- userForm.setUserEnabled(website.getIsEnabled());
}
else
{
@@ -141,7 +136,6 @@
if (userForm.getDelete())
{
// TODO: ask are you sure before deleting user
- PageCacheFilter.removeFromCache( request, user );
user = deleteUser(mapping, request, rreq, userForm, mgr, user);
msgs.add(ActionMessages.GLOBAL_MESSAGE,
@@ -171,10 +165,6 @@
mgr.storeUser( user );
rreq.getRoller().commit();
- // Flush both main page and regular page caches
- refreshIndexCache(request, rreq, userForm);
- PageCacheFilter.removeFromCache( request, user );
-
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
saveMessages(request, msgs);
@@ -209,12 +199,12 @@
{
// remove user's Entries from Lucene index
IndexManager indexManager = rreq.getRoller().getIndexManager();
- indexManager.removeUserIndex(ud);
+ WebsiteData website = rreq.getCurrentWebsite();
+ indexManager.removeWebsiteIndex(website);
// delete user from database
ud.remove();
rreq.getRoller().commit();
- PageCacheFilter.removeFromCache( request, ud );
ud = null;
request.getSession().setAttribute(
@@ -223,7 +213,7 @@
uaf.reset(mapping, request);
- List users = mgr.getUsers(false);
+ List users = mgr.getUsers(null, null);
request.setAttribute("users", users);
return ud;
}
@@ -248,11 +238,10 @@
// if admin requests an index be re-built, do it
IndexManager manager = rreq.getRoller().getIndexManager();
- manager.rebuildUserIndex();
+ manager.rebuildWebsiteIndex();
request.getSession().setAttribute(
RollerSession.STATUS_MESSAGE,
- "Successfully scheduled rebuild of index for '"
- + uaf.getUserName() + "'");
+ "Successfully scheduled rebuild of index for");
}
}
catch (Exception e)