this is my fault for not paying attention, but what again is the plan w/
regard to roller 3.0 and trunk merge? will there be a roller 2.3.1? or
just a 3.1 which is 3.0 merged to the trunk?
i ask because i was hoping to have these fixes available where i can use
then in conjunction w/ the latest adminapi stuff, which in on the trunk.
should i commit this to the trunk? i don't want to make any eventual
merge any more difficult than necessary.
Dave Johnson wrote:
Thanks Jeff,
I just added those changes (and some other APP fixes) to the Roller
3.0 branch.
- Dave
On 8/22/06, Jeff Blattman <[EMAIL PROTECTED]> wrote:
1. feed title was hardcoding english text. changed to use the website
name for the title
2. i had a requirement to be able to display the link to the weblog from
the APP client. fill in the Atom feed link field.
thanks.
Index: RollerAtomHandler.java
===================================================================
--- RollerAtomHandler.java (revision 429826)
+++ RollerAtomHandler.java (working copy)
@@ -274,7 +274,13 @@
max + 1); // maxEntries
Feed feed = new Feed();
feed.setId(absUrl + "/app/" +website.getHandle() +
"/entries/" + start);
- feed.setTitle("Entries for blog[" + handle + "]");
+ feed.setTitle(website.getName());
+ Link link = new Link();
+ link.setHref(absUrl + "/page/" + website.getHandle());
+ link.setRel("alternate");
+ link.setType("text/html");
+
feed.setAlternateLinks(Collections.singletonList(link));
+
List atomEntries = new ArrayList();
int count = 0;
for (Iterator iter = entries.iterator(); iter.hasNext()
&& count < mMaxEntries; count++) {
@@ -335,6 +341,13 @@
if (canView(website)) {
Feed feed = new Feed();
feed.setId(absUrl + "/app/" +website.getHandle() +
"/entries/" + start);
+ feed.setTitle(website.getName());
+ Link link = new Link();
+ link.setHref(absUrl + "/page/" + website.getHandle());
+ link.setRel("alternate");
+ link.setType("text/html");
+
feed.setAlternateLinks(Collections.singletonList(link));
+
SortedSet sortedSet = new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
File f1 = (File)o1;
