roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r424407 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/pojos/ src/org/apache/roller/ui/rendering/model/ src/org/apache/roller/ui/rendering/servlets/ src/org/apache/roller/util/ web/ web/WEB-INF/classes/ web/WEB-INF/veloci...
Date Fri, 21 Jul 2006 18:18:03 GMT
Author: snoopdave
Date: Fri Jul 21 11:18:02 2006
New Revision: 424407

URL: http://svn.apache.org/viewvc?rev=424407&view=rev
Log:
Fixed up feeds. They now use URLModel where appropriate and all include a style sheet

Added:
    incubator/roller/branches/roller_3.0/web/theme/styles/
    incubator/roller/branches/roller_3.0/web/theme/styles/atom-xsl.jsp
    incubator/roller/branches/roller_3.0/web/theme/styles/rss-xsl.jsp
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/CommentData.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ModelLoader.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/feeds.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/error-page.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/planet/planetrss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
    incubator/roller/branches/roller_3.0/web/index.jsp

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/CommentData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/CommentData.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/CommentData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/CommentData.java Fri Jul 21 11:18:02 2006
@@ -239,24 +239,7 @@
     public void setRemoteHost(String remoteHost) {
         this.remoteHost = remoteHost;
     }
-    
-    /** 
-     * Get comment's permalink, suitable for use as an RSS guid or Atom id.
-     * @roller.wrapPojoMethod type="simple"
-     */
-    public String getPermalink() {
-        String ret = null;
-        if (weblogEntry != null) {
-            ret = weblogEntry.getPermalink() + "#comment-" + postTime.getTime();
-        }
-        return ret;
-    }
-    
-    /**
-     * No-op to please XDoclet, permalink is read-only.
-     */
-    public void setPermalink(String permalink) {}
-    
+        
     /**
      * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field
@@ -342,4 +325,17 @@
         this.approved = otherComment.getApproved();
     }
     
+    /**
+     * Timestamp to be used to formulate comment permlink.
+     * @roller.wrapPojoMethod type="simple"
+     */
+    public String getTimestamp() {
+        if (postTime != null) {
+            return Long.toString(postTime.getTime());
+        }
+        return null;
+    }
+    
+    /** No-op to please XDoclet */      
+    public void setTimestamp(String timeStamp) {}
 }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java Fri Jul 21 11:18:02 2006
@@ -79,6 +79,13 @@
     /**
      * Get category path or name specified by request.
      */
+    public boolean getExcerpts() {
+        return feedRequest.isExcerpts();
+    }
+    
+    /**
+     * Get category path or name specified by request.
+     */
     public String getCategoryPath() {
         return feedRequest.getWeblogCategoryName();
     }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ModelLoader.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ModelLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/ModelLoader.java Fri Jul 21 11:18:02 2006
@@ -118,6 +118,11 @@
     public static void loadFeedModels(Map model, Map initData)
             throws RollerException {
         
+        // feeds need url building too
+        URLModel urlModel = new URLModel();
+        urlModel.init(initData);
+        model.put(urlModel.getModelName(), urlModel);
+
         String weblogModels = 
                 RollerConfig.getProperty("rendering.feedRenderModels");
         loadModels(weblogModels, model, initData);

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/URLModel.java Fri Jul 21 11:18:02 2006
@@ -136,6 +136,10 @@
         return URLUtilities.getWeblogEntryURL(weblog, locale, anchor, true);
     }
     
+    public String comment(String anchor, String timeStamp) {
+        return URLUtilities.getWeblogCommentURL(weblog, locale, anchor, timeStamp, true);
+    }
+    
     
     public String comments(String anchor) {
         return URLUtilities.getWeblogCommentsURL(weblog, locale, anchor, true);

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java Fri Jul 21 11:18:02 2006
@@ -285,7 +285,7 @@
         public String getNextName() {
             if (getNextEntry() != null) {
                 String title = Utilities.truncateNicely(getNextEntry().getTitle(), 15, 20, "...");
-                String msg = bundle.getString("weblogEntriesPager.singleEntry.next");
+                String msg = bundle.getString("weblogEntriesPager.single.next");
                 return MessageFormat.format(msg, new Object[] {title});
             }
             return null;
@@ -301,7 +301,7 @@
         public String getPrevName() {
             if (getPrevEntry() != null) {
                 String title = Utilities.truncateNicely(getPrevEntry().getTitle(), 15, 20, "...");
-                String msg = bundle.getString("weblogEntriesPager.singleEntry.prev");
+                String msg = bundle.getString("weblogEntriesPager.single.prev");
                 return MessageFormat.format(msg, new Object[] {title});
             }
             return null;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Fri Jul 21 11:18:02 2006
@@ -127,12 +127,19 @@
         response.setDateHeader("Last-Modified", lastModified);
         
         // set content type
-        if("rss".equals(feedRequest.getFormat())) {
+        String accepts = request.getHeader("Accept");
+        String userAgent = request.getHeader("User-Agent");
+        if (accepts != null && userAgent != null 
+            && accepts.indexOf("*/*") != -1 && userAgent.startsWith("Mozilla")) {
+            // client is a browser and now that we offer styled feeds we want 
+            // browsers to load the page rather than popping up the download 
+            // dialog, so we provide a content-type that browsers will display
+            response.setContentType("text/xml");
+        } else if("rss".equals(feedRequest.getFormat())) {
             response.setContentType("application/rss+xml; charset=utf-8");
         } else if("atom".equals(feedRequest.getFormat())) {
             response.setContentType("application/atom+xml; charset=utf-8");
-        }
-        
+        }        
         
         // generate cache key
         String cacheKey = null;

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java Fri Jul 21 11:18:02 2006
@@ -107,7 +107,18 @@
         }
         
         // set content type
-        response.setContentType("application/rss+xml; charset=utf-8");
+        // set content type
+        String accepts = request.getHeader("Accept");
+        String userAgent = request.getHeader("User-Agent");
+        if (accepts != null && userAgent != null 
+            && accepts.indexOf("*/*") != -1 && userAgent.startsWith("Mozilla")) {
+            // client is a browser and now that we offer styled feeds we want 
+            // browsers to load the page rather than popping up the download 
+            // dialog, so we provide a content-type that browsers will display
+            response.setContentType("text/xml");
+        } else {
+            response.setContentType("application/rss+xml; charset=utf-8");
+        }
         
         // set last-modified date
         // small hack here, we add 1 second (1000 ms) to the last mod time to

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java Fri Jul 21 11:18:02 2006
@@ -88,6 +88,18 @@
         return getWeblogEntryURL(weblog, locale, entryAnchor, absolute)+"#comments";
     }
     
+    /**
+     * Get url for a single weblog entry comments on a given weblog.
+     */
+    public static final String getWeblogCommentURL( WebsiteData weblog,
+                                                    String locale,
+                                                    String entryAnchor,
+                                                    String timeStamp,
+                                                    boolean absolute) {
+        
+        return getWeblogEntryURL(weblog, locale, entryAnchor, absolute)+"#comment-"+timeStamp;
+    }
+    
     
     /**
      * Get url for a collection of entries on a given weblog.

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/ApplicationResources.properties Fri Jul 21 11:18:02 2006
@@ -1398,10 +1398,10 @@
 weblogEntriesPager.latest.next=Next page
 weblogEntriesPager.latest.prev=Previous page
 
-weblogEntriesPager.singleEntry.home=Main
+weblogEntriesPager.single.home=Main
 # argument ${0} is truncated title of weblog entry
-weblogEntriesPager.singleEntry.next={0}
-weblogEntriesPager.singleEntry.prev={0}
+weblogEntriesPager.single.next={0}
+weblogEntriesPager.single.prev={0}
 
 weblogEntriesPager.day.home=Main
 # argument ${0} is date of next day

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/feeds.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/feeds.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/feeds.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/feeds.vm Fri Jul 21 11:18:02 2006
@@ -1,3 +1,20 @@
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+*#
 
 #** macros for use by Roller's built-in feed templates
 
@@ -18,8 +35,8 @@
         <published>$utils.formatIso8601Date($entry.pubTime)</published>
         <updated>$utils.formatIso8601Date($entry.updateTime)</updated> 
         <category term="$utils.escapeHTML($entry.category.path)" label="$utils.escapeHTML($entry.category.name)" />
-        #if( $utils.isNotEmpty($entry.summary))<summary type="html">$utils.escapeHTML($plugins.render($entry, $entry.summary, false))</summary>#end
-        #if( $utils.isNotEmpty($entry.text) )<content type="html">$utils.escapeHTML($plugins.render($entry, $entry.text, false))</content>#end
+        #if( $utils.isNotEmpty($entry.summary))<summary type="html">$utils.escapeHTML($entry.transformedSummary)</summary>#end
+        #if( $utils.isNotEmpty($entry.text) )<content type="html">$utils.escapeHTML($entry.transformedText)</content>#end
         #set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
         #set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
         #set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
@@ -43,9 +60,9 @@
     #end
     <pubDate>$utils.formatRfc822Date($entry.pubTime)</pubDate>
     <category>$utils.escapeHTML($entry.category.name)</category>
-    #if( $utils.isNotEmpty($entry.summary) && $utils.isNotEmpty($entry.text))<atom:summary type="html">$utils.escapeHTML($plugins.render($entry, $entry.summary, false))</atom:summary>#end
-    #if( $utils.isNotEmpty($entry.summary) && $utils.isEmpty($entry.text))<description>$utils.escapeHTML($plugins.render($entry, $entry.summary, false))</description>#end
-    #if( $utils.isNotEmpty($entry.text) )<description>$utils.escapeHTML($plugins.render($entry, $entry.text, false))</description>#end
+    #if( $utils.isNotEmpty($entry.summary) && $utils.isNotEmpty($entry.text))<atom:summary type="html">$utils.escapeHTML($entry.transformedSummary)</atom:summary>#end
+    #if( $utils.isNotEmpty($entry.summary) && $utils.isEmpty($entry.text))<description>$utils.escapeHTML($entry.transformedText)</description>#end
+    #if( $utils.isNotEmpty($entry.text) )<description>$utils.escapeHTML($entry.transformedText)</description>#end
     #set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
     #set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
     #set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
@@ -63,10 +80,10 @@
 #macro(showCommentsAtom10 $comments)
     #foreach($comment in $comments)
     <entry>
-        <id>$comment.permalink</id> 
+        <id>$url.comment($comment.weblogEntry.anchor, $comment.timestamp)</id> 
         <title type="html">Re: $utils.escapeHTML($comment.weblogEntry.title)</title>
         <author><name>$utils.escapeHTML($utils.removeHTML($comment.name))</name></author>
-        <link rel="alternate" type="text/html" href="$comment.weblogEntry.permalink"/>
+        <link rel="alternate" type="text/html" href="$url.comment($comment.weblogEntry.anchor, $comment.timestamp)"/>
         <published>$utils.formatIso8601Date($comment.postTime)</published>
         <updated>$utils.formatIso8601Date($comment.postTime)</updated> 
         #if($config.getBooleanProperty("users.comments.escapehtml"))
@@ -86,7 +103,7 @@
 #macro(showCommentsRSS20 $comments)
     #foreach($comment in $comments)
     <item>
-        <guid isPermaLink="true">$comment.permalink</guid>
+        <guid isPermaLink="true">$url.comment($comment.weblogEntry.anchor, $comment.timestamp)</guid>
         <title>Re: $utils.escapeHTML($comment.weblogEntry.title)</title>
         <dc:creator>$utils.escapeHTML($utils.removeHTML($comment.name))</dc:creator>
         <pubDate>$utils.formatRfc822Date($comment.postTime)</pubDate>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm Fri Jul 21 11:18:02 2006
@@ -1,3 +1,20 @@
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+*#
 
 #** macros for use with SitePageModel
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/error-page.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/error-page.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/error-page.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/error-page.vm Fri Jul 21 11:18:02 2006
@@ -1,4 +1,20 @@
-<html>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+*#<html>
 <body>
 
 <h1>Velocity template error</h1>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm Fri Jul 21 11:18:02 2006
@@ -1,10 +1,27 @@
-$pageHelper.setContentType("application/atom+xml;charset=utf-8")<?xml version="1.0" encoding='utf-8'?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#$pageHelper.setContentType("application/atom+xml;charset=utf-8")<?xml version="1.0" encoding='utf-8'?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeHTML($config.getConfigProperty("site.name"))) (Comments)</title>
     <id>$config.absoluteContextURL/atom/$model.weblog.handle</id>
     <link rel="alternate" type="text/html" href="$model.weblog.URL" />
-    <link rel="self" type="application/atom+xml" 
-        href="$config.absoluteContextURL/atom/$model.weblog.handle/comments" />
+    <id>$url.feed.comments.atom($model.categoryPath, $model.excerpts)</id>
+    <link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
     #set($comments = $site.getComments(0, $model.weblog.entryDisplayCount))

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm Fri Jul 21 11:18:02 2006
@@ -1,10 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" 
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:atom="http://www.w3.org/2005/Atom" >
 <channel>
   <title>$utils.escapeHTML($config.getConfigProperty("site.name")) (Comments)</title>
-  <link>$config.absoluteContextURL</link>
+  <link>$url.absoluteSite</link>
+  <atom:link rel="self" type="application/rss+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
   <description>$utils.escapeHTML($model.weblog.description)</description>
   <language>en-us</language>
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm Fri Jul 21 11:18:02 2006
@@ -1,19 +1,27 @@
-<?xml version="1.0" encoding='utf-8'?>
-<!-- TODO: this won't work, we need to use category string -->
-#if($model.weblogCategory && $model.weblogCategory.path.length() > 0) 
-   #set($postfix = "?catname=$model.weblogCategory.path") 
-   #set($cat = $model.weblogCategory.path)
-#else
-   #set($cat = "") 
-   #set($postfix = "") 
-#end  
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding='utf-8'?> 
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeHTML($config.getConfigProperty("site.name"))</title>
     <subtitle type="html">$utils.escapeHTML($config.getConfigProperty("site.description"))</subtitle>
-    <id>$config.absoluteContextURLL</id>
-    <link rel="alternate" type="text/html" href="$config.absoluteContextURL" />
-    <link rel="self" type="application/atom+xml" 
-        href="$config.absoluteContextURL/$model.weblog.handle/feeds/entries/atom$postfix" />
+    <id>$url.absoluteSite</id>
+    <link rel="alternate" type="text/html" href="$url.absoluteSite" />
+    <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
     #set($entries = $site.getWeblogEntries("nil" $cat, 0, $model.weblog.entryDisplayCount))

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm Fri Jul 21 11:18:02 2006
@@ -1,17 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- TODO: this won't work, we need to use category string -->
-#if($model.weblogCategory && $model.weblogCategory.path.length() > 0) 
-   #set($postfix = "?catname=$model.weblogCategory.path") 
-   #set($cat = $model.weblogCategory.path)
-#else
-   #set($postfix = "") 
-#end  
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" 
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:atom="http://www.w3.org/2005/Atom" >
 <channel>
   <title>$utils.escapeHTML($config.getConfigProperty("site.name"))</title>
-  <link>$config.absoluteContextURL</link>
+  <atom:subtitle type="html">$utils.escapeHTML($config.getConfigProperty("site.description"))</subtitle>
+  <link>$url.absoluteSite</link>
+  <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
   <description>$utils.escapeHTML($config.getConfigProperty("site.description"))</description>
   <language>en-us</language>
   <copyright>Copyright #formatDate("yyyy" $model.now)</copyright>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm Fri Jul 21 11:18:02 2006
@@ -1,10 +1,27 @@
-<?xml version="1.0" encoding='utf-8'?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding='utf-8'?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/atom-xsl.jsp" media="screen"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeHTML($model.weblog.name) (Comments)</title>
     <id>$config.absoluteContextURL/atom/$model.weblog.handle</id>
-    <link rel="alternate" type="text/html" href="$model.weblog.URL" />
-    <link rel="self" type="application/atom+xml" 
-        href="$config.absoluteContextURL/atom/$model.weblog.handle/comments" />
+    <link rel="alternate" type="text/html" href="$url.home" />
+    <link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
   #set($comments = $model.getComments())

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm Fri Jul 21 11:18:02 2006
@@ -1,10 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/rss-xsl.jsp" media="screen"?>
 <rss version="2.0" 
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:atom="http://www.w3.org/2005/Atom" >
 <channel>
   <title>$utils.escapeHTML($utils.removeHTML($model.weblog.name)) (Comments)</title>
-  <link>$config.absoluteContextURL</link>
+  <link>$url.home</link>
+  <atom:link rel="self" type="application/rss+xml" href="$url.feed.comments.rss($model.categoryPath, $model.excerpts)" />
   <description>$utils.escapeHTML($model.weblog.description)</description>
   <language>en-us</language>
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm Fri Jul 21 11:18:02 2006
@@ -1,11 +1,28 @@
-<?xml version="1.0" encoding='utf-8'?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding='utf-8'?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/atom-xsl.jsp" media="screen"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeHTML($model.weblog.name)</title>
     <subtitle type="html">$utils.escapeHTML($model.weblog.description)</subtitle>
-    <id>$config.absoluteContextURL/atom/$model.weblog.handle</id>
-    <link rel="alternate" type="text/html" href="$model.weblog.URL" />
-    <link rel="self" type="application/atom+xml" 
-        href="$config.absoluteContextURLL/atom/$model.weblog.handle$postfix" />
+    <id>$url.feed.entries.atom</id>
+    <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
+    <link rel="alternate" type="text/html" href="$url.home" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
     #set($entries = $model.getWeblogEntries())

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm Fri Jul 21 11:18:02 2006
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+
+*#<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/rss-xsl.jsp" media="screen"?>
 #if($model.weblogCategory && $model.weblogCategory.path.length() > 0) 
    #set($postfix = "?catname=$model.weblogCategory.path") 
    #set($cat = $model.weblogCategory.path)
@@ -9,7 +27,8 @@
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" >
 <channel>
     <title>$utils.escapeHTML($utils.removeHTML($model.weblog.name))</title>
-    <link>$model.weblog.URL</link>
+    <link>$url.home</link>
+    <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
     <description>$utils.escapeHTML($model.weblog.description)</description>
     <language>en-us</language>
     <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/planet/planetrss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/planet/planetrss.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/planet/planetrss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/planet/planetrss.vm Fri Jul 21 11:18:02 2006
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+*#<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <channel>
   #if($group)

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Fri Jul 21 11:18:02 2006
@@ -1,3 +1,20 @@
+#**
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+*#
 
 #** Set of essential macros needed in Roller velocity templates.
 

Modified: incubator/roller/branches/roller_3.0/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/index.jsp?rev=424407&r1=424406&r2=424407&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/index.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/index.jsp Fri Jul 21 11:18:02 2006
@@ -1,6 +1,6 @@
 <%--
   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  The ASF licenses this file to You
+  contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License.
   You may obtain a copy of the License at

Added: incubator/roller/branches/roller_3.0/web/theme/styles/atom-xsl.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/theme/styles/atom-xsl.jsp?rev=424407&view=auto
==============================================================================
--- incubator/roller/branches/roller_3.0/web/theme/styles/atom-xsl.jsp (added)
+++ incubator/roller/branches/roller_3.0/web/theme/styles/atom-xsl.jsp Fri Jul 21 11:18:02 2006
@@ -0,0 +1,123 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+  
+--%><%@page contentType="text/xsl"%><%@page pageEncoding="UTF-8"%><?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet 
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+   xmlns:atom="http://www.w3.org/2005/Atom">
+<xsl:output method="xml"  />
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<head>
+<title><xsl:value-of select="atom:feed/atom:title"/></title>
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/layout.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/roller.css"/>' />      
+<%
+String theme = theme = RollerConfig.getProperty("editor.theme");
+if (theme == null && session != null) {
+    theme = (String)session.getAttribute("look");
+}
+if (theme == null) {
+    theme = RollerConfig.getProperty("editor.theme");
+}
+if (session !=null) session.setAttribute("look", theme);
+%>
+<link rel="stylesheet" type="text/css" media="all" 
+    href="<%= request.getContextPath() %>/roller-ui/theme/<%= theme %>/colors.css" /> 
+<style type="text/css">
+#centercontent_wrap {
+    width: 100%;
+}
+</style>
+</head>
+<body>	
+
+<div id="banner">
+    <div class="bannerStatusBox">   
+        <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
+        <tr>
+        <td class="bannerLeft">
+            Atom 1.0
+        </td>
+        <td class="bannerRight">  
+            <xsl:value-of select="atom:feed/atom:generator"/><xsl:text> </xsl:text><xsl:value-of select="atom:feed/atom:generator/@version"/>
+        </td>
+        </tr>
+        </table>    
+    </div>
+</div>
+    
+<div id="wrapper">
+    <div id="leftcontent_wrap">
+        <div id="leftcontent"> 
+        
+        </div>
+    </div>
+    
+    <div id="centercontent_wrap">
+        <div id="centercontent"> 
+            
+            <h1>Atom newsfeed</h1>
+
+This page is an <a href="http://www.ietf.org/rfc/rfc4287.txt">Atom</a> newsfeed, an XML data representation of the latest entries
+from a Roller weblog. If you have a newsfeed reader or aggregator, you can 
+subscribe to this newsfeed. To subscribe, copy the URL from your browser's 
+address bar above and copy it into your newsfeed reader. 
+            
+
+            <h1>Latest items in newsfeed [<xsl:value-of select="atom:feed/atom:title"/>]</h1>
+            <ol>
+                <xsl:for-each select="atom:feed/atom:entry">       
+                <li>
+                    <h4><a><xsl:attribute name="href"><xsl:value-of select="atom:link/@href"/></xsl:attribute><xsl:value-of select="atom:title"/></a></h4>
+                    Published <xsl:value-of select="atom:updated"/> by <xsl:value-of select="atom:author/atom:name" />
+                </li>
+                </xsl:for-each>
+            </ol>
+            
+<br />      
+<hr />            
+            <p>To learn more about Atom visit <a href="http://www.ietf.org/rfc/rfc4287.txt">http://www.ietf.org/rfc/rfc4287.txt</a></p>
+            
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+           <br />
+        </div>
+    </div>
+ 
+</div>
+
+<div id="footer">
+   <br />
+</div> 
+        
+<div id="datetagdiv" 
+   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+</div>
+
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>

Added: incubator/roller/branches/roller_3.0/web/theme/styles/rss-xsl.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/theme/styles/rss-xsl.jsp?rev=424407&view=auto
==============================================================================
--- incubator/roller/branches/roller_3.0/web/theme/styles/rss-xsl.jsp (added)
+++ incubator/roller/branches/roller_3.0/web/theme/styles/rss-xsl.jsp Fri Jul 21 11:18:02 2006
@@ -0,0 +1,122 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+  
+--%><%@page contentType="text/xsl"%><%@page pageEncoding="UTF-8"%><?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet 
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+   xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.0">
+<xsl:output method="xml"  />
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<head>
+<title><xsl:value-of select="rss/channel/title"/></title>
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/layout.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" 
+    href='<c:url value="/roller-ui/styles/roller.css"/>' />      
+<%
+String theme = theme = RollerConfig.getProperty("editor.theme");
+if (theme == null && session != null) {
+    theme = (String)session.getAttribute("look");
+}
+if (theme == null) {
+    theme = RollerConfig.getProperty("editor.theme");
+}
+if (session !=null) session.setAttribute("look", theme);
+%>
+<link rel="stylesheet" type="text/css" media="all" 
+    href="<%= request.getContextPath() %>/roller-ui/theme/<%= theme %>/colors.css" /> 
+<style type="text/css">
+#centercontent_wrap {
+    width: 100%;
+}
+</style>
+</head>
+<body>	
+
+<div id="banner">
+    <div class="bannerStatusBox">   
+        <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
+        <tr>
+        <td class="bannerLeft">
+            RSS 2.0
+        </td>
+        <td class="bannerRight">  
+            <xsl:value-of select="rss/channel/generator" />
+        </td>
+        </tr>
+        </table>    
+    </div>
+</div>
+    
+<div id="wrapper">
+    <div id="leftcontent_wrap">
+        <div id="leftcontent"> 
+        
+        </div>
+    </div>
+    
+    <div id="centercontent_wrap">
+        <div id="centercontent"> 
+            
+            <h1>RSS newsfeed</h1>
+
+<p>This page is an <a href="http://blogs.law.harvard.edu/tech/rss">RSS</a> newsfeed, an XML data representation of the latest entries
+from a Roller weblog. If you have a newsfeed reader or aggregator, you can 
+subscribe to this newsfeed. To subscribe, copy the URL from your browser's 
+address bar above and copy it into your newsfeed reader.</p>
+            
+            <h1>Latest items in newsfeed [<xsl:value-of select="rss/channel/title"/>]</h1>
+
+            <ol>
+                <xsl:for-each select="rss/channel/item">       
+                <li>
+                    <h4><a><xsl:attribute name="href"><xsl:value-of select="guid"/></xsl:attribute><xsl:value-of select="title"/></a></h4>
+                    Published <xsl:value-of select="pubDate"/> by <xsl:value-of select="dc:creator" />
+                </li>
+                </xsl:for-each>
+            </ol>
+<br />      
+<hr />
+<p>To learn more about RSS visit <a href="http://blogs.law.harvard.edu/tech/rss">http://blogs.law.harvard.edu/tech/rss</a></p>
+
+        </div>
+    </div>
+    
+    <div id="rightcontent_wrap">
+        <div id="rightcontent"> 
+           <br />
+        </div>
+    </div>
+ 
+</div>
+
+<div id="footer">
+   <br />
+</div> 
+        
+<div id="datetagdiv" 
+   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+</div>
+
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>



Mime
View raw message