Fri Nov 24 12:00:21 CET 2006

Author: simon
Date: 2006-11-24 12:00:19 +0100 (Fri, 24 Nov 2006)
New Revision: 20300

Added:
   public/yanel/trunk/src/realms/yanel-website/content/img/feed-icon-16x16.png
   public/yanel/trunk/src/realms/yanel-website/content/img/valid-atom.png
   public/yanel/trunk/src/realms/yanel-website/content/img/valid-rss.png
   public/yanel/trunk/src/realms/yanel-website/content/news/
   public/yanel/trunk/src/realms/yanel-website/content/news/introspection-atom.xml
   public/yanel/trunk/src/realms/yanel-website/content/news/introspection-news.xml
   public/yanel/trunk/src/realms/yanel-website/content/news/news-atom-entries/
   public/yanel/trunk/src/realms/yanel-website/content/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml
   public/yanel/trunk/src/realms/yanel-website/content/news/news.xhtml
   public/yanel/trunk/src/realms/yanel-website/content/rtd/news-atom-feed.rtd
   public/yanel/trunk/src/realms/yanel-website/content/rtd/news-page.rtd
   public/yanel/trunk/src/realms/yanel-website/content/xslt/news-atom-entries2xhtml.xsl
   public/yanel/trunk/src/realms/yanel-website/paths/img/feed-icon-16x16.png/
   public/yanel/trunk/src/realms/yanel-website/paths/img/feed-icon-16x16.png/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/img/valid-atom.png/
   public/yanel/trunk/src/realms/yanel-website/paths/img/valid-atom.png/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/img/valid-rss.png/
   public/yanel/trunk/src/realms/yanel-website/paths/img/valid-rss.png/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.html.yanel-rti/
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.html.yanel-rti/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.html/
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.html/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.xhtml/
   public/yanel/trunk/src/realms/yanel-website/paths/news/index.xhtml/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-atom.xml/
   public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-atom.xml/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-index.xml/
   public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-index.xml/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries.yanel-rti/
   public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries.yanel-rti/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/
   public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml/
   public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml/.yarep-uid
   public/yanel/trunk/src/realms/yanel-website/paths/xslt/news-atom-entries2xhtml.xsl/
   public/yanel/trunk/src/realms/yanel-website/paths/xslt/news-atom-entries2xhtml.xsl/.yarep-uid
Modified:
   public/yanel/trunk/src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java
   public/yanel/trunk/src/realms/yanel-website/content/xslt/global.xsl
   public/yanel/trunk/src/realms/yanel-website/uuid2path.xml
Log:
committing patch of bug#4952. implements rss. thanks to paloma!

Modified: public/yanel/trunk/src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java
===================================================================

--- public/yanel/trunk/src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/contributions/resources/atom/src/java/org/wyona/yanel/impl/resources/AtomFeedResource.java	2006-11-24 11:00:19 UTC (rev 20300)
@@ -190,7 +190,23 @@
 	    defaultView.setInputStream(new java.io.StringBufferInputStream(sb.toString()));
             return defaultView;
         }
+        
+        if (viewId != null && viewId.equals("rss2.0")) {
+        	try {
+        		File xsltFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "atomfeed2rss2.0.xsl");
+        		Transformer transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltFile));
+        		java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+                transformer.transform(new StreamSource(new java.io.StringBufferInputStream(sb.toString())), new StreamResult(baos));
+                defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));
+                defaultView.setMimeType("text/xml");
+                defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));	            
+        	} catch(Exception e) {
+                log.error(e);
+            }
+            return defaultView;
+        }
 
+
         try {
             Transformer transformer = TransformerFactory.newInstance().newTransformer(getXSLTStreamSource(path, contentRepo));
             transformer.setParameter("yanel.path.name", path.getName());
@@ -202,7 +218,7 @@
             transformer.transform(new StreamSource(new java.io.StringBufferInputStream(sb.toString())), new StreamResult(baos));
             defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));
             defaultView.setMimeType(getMimeType(path));
-	    defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));
+	        defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));
         } catch (Exception e) {
             log.error(e);
         }

Added: public/yanel/trunk/src/realms/yanel-website/content/img/feed-icon-16x16.png
===================================================================
(Binary files differ)


Property changes on: public/yanel/trunk/src/realms/yanel-website/content/img/feed-icon-16x16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: public/yanel/trunk/src/realms/yanel-website/content/img/valid-atom.png
===================================================================
(Binary files differ)


Property changes on: public/yanel/trunk/src/realms/yanel-website/content/img/valid-atom.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: public/yanel/trunk/src/realms/yanel-website/content/img/valid-rss.png
===================================================================
(Binary files differ)


Property changes on: public/yanel/trunk/src/realms/yanel-website/content/img/valid-rss.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: public/yanel/trunk/src/realms/yanel-website/content/news/introspection-atom.xml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/news/introspection-atom.xml	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/news/introspection-atom.xml	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<service xmlns="http://purl.org/atom/app#">
+  <workspace title="Yanel Website News">
+    <collection title="News" href="news-atom-entries/?yanel.resource.viewid=atom">
+    </collection>
+  </workspace>
+</service>

Added: public/yanel/trunk/src/realms/yanel-website/content/news/introspection-news.xml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/news/introspection-news.xml	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/news/introspection-news.xml	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<introspection xmlns="http://www.wyona.org/neutron/1.0">
+
+<edit mime-type="application/xml" name="News Layout">
+  <checkout url="../xslt/news-atom-entries2xhtml.xsl?yanel.resource.usecase=checkout" method="GET"/>
+  <checkin url="../xslt/news-atom-entries2xhtml.xsl?yanel.resource.usecase=checkin" method="PUT"/>
+</edit>
+</introspection>

Added: public/yanel/trunk/src/realms/yanel-website/content/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,21 @@
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">phoenix-prototype-1-0.1.8</title>
+ <author><name>Michael Wechner</name></author>
+
+ <id>urn:lenya-uuid:download:release-atom-entries:phoenix-prototype-1-0.1.8.xml</id>
+ <updated>2006-10-07T01:28:52.047Z</updated>
+ <published>2006-07-13T16:30:57-01:00</published>
+
+ <summary type="html">Phoenix Development Release: phoenix-prototype-1-0.1.8</summary>
+ <content type="xhtml">
+   <div xmlns="http://www.w3.org/1999/xhtml">
+     <a href="phoenix-prototype-1-0.1.8.xpi">phoenix-prototype-1-0.1.8.xpi</a> (July 13, 2006)
+     <br/><br/>Changelog:
+     <ul>
+       <li>XSLT view.</li>
+       <li>Lots of under-the-hood changes.</li>
+     </ul>
+   </div>
+ </content>
+ <dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/">Phoenix Development Release: phoenix-prototype-1-0.1.8</dc:subject>
+</entry>
\ No newline at end of file

Added: public/yanel/trunk/src/realms/yanel-website/content/news/news.xhtml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/news/news.xhtml	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/news/news.xhtml	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+<?xml version="1.0"?>

Added: public/yanel/trunk/src/realms/yanel-website/content/rtd/news-atom-feed.rtd
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/rtd/news-atom-feed.rtd	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/rtd/news-atom-feed.rtd	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,6 @@
+<{http://www.wyona.org/yanel/resource/1.0}atom/>
+feed-title: News
+author: Yanel Editorial Team
+xslt: /xslt/news-atom-entries2xhtml.xsl
+self-url: http://yanel.wyona.org/news/release-atom-entries/?yanel.resource.viewid=atom
+#self-url: http://www.yulup.org:9190/ulysses/download/release-atom-entries/?yanel.resource.viewid=atom

Added: public/yanel/trunk/src/realms/yanel-website/content/rtd/news-page.rtd
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/rtd/news-page.rtd	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/rtd/news-page.rtd	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,4 @@
+<{http://www.wyona.org/yanel/resource/1.0}xml/>
+mime-type: application/xhtml+xml
+xslt: /xslt/global.xsl
+yanel-path: /news/news-atom-entries/

Modified: public/yanel/trunk/src/realms/yanel-website/content/xslt/global.xsl
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/xslt/global.xsl	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/xslt/global.xsl	2006-11-24 11:00:19 UTC (rev 20300)
@@ -95,10 +95,11 @@
 &#160;<a href="{$yarep.back2realm}license.html">License</a><br/>
 &#160;<a href="{$yarep.back2realm}{$language}/getting-started.html">Getting Started</a><br/>
 &#160;Features<br/>
+<!--
 &#160;News<br/>
-<!--
+ -->
 &#160;<a href="{$yarep.back2realm}news/index.html">News</a><br/>
--->
+
 &#160;<a href="{$yarep.back2realm}documentation/index.html">Documentation</a><br/>
 <br/>
 <b>Development/Community</b><br/>

Added: public/yanel/trunk/src/realms/yanel-website/content/xslt/news-atom-entries2xhtml.xsl
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/xslt/news-atom-entries2xhtml.xsl	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/content/xslt/news-atom-entries2xhtml.xsl	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns:atom="http://www.w3.org/2005/Atom"
+>
+
+<xsl:output method="xml" encoding="UTF-8" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"/>
+
+<xsl:param name="yanel.path.name" select="'NAME_IS_NULL'"/>
+<xsl:param name="yanel.path" select="'PATH_IS_NULL'"/>
+<xsl:param name="yanel.back2context" select="'BACK2CONTEXT_IS_NULL'"/>
+<xsl:param name="yanel.back2realm" select="'BACK2REALM_IS_NULL'"/>
+
+<xsl:variable name="name-without-suffix" select="substring-before($yanel.path.name, '.')"/>
+
+<xsl:template match="/">
+<html>
+<head>
+  <title>News</title>
+  <link rel="alternate" title="Yanel News" href="news-atom-entries/?yanel.resource.viewid=atom" type="application/atom+xml"/>
+  <link rel="introspection" href="introspection-atom.xml" type="application/atomserv+xml"/>
+</head>
+<body>
+
+<h2>Yanel News</h2>
+
+
+<xsl:apply-templates select="/atom:feed/atom:entry"/>
+
+
+<p>
+<a href="http://www.feedvalidator.org/check.cgi?url=http%3A//yanel.wyona.org/news/news-atom-entries/?yanel.resource.viewid=atom"><img src="../img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" border="0"/></a>
+
+<a href="http://www.feedvalidator.org/check.cgi?url=http%3A//yanel.wyona.org/news/news-atom-entries/?yanel.resource.viewid=rss2.0"><img src="../img/valid-rss.png" alt="[Valid RSS 2.0]" title="Validate my RSS 2.0 feed" border="0"/></a>
+
+&#160;
+<a href="news-atom-entries/?yanel.resource.viewid=rss2.0"><img src="../img/feed-icon-16x16.png" alt="[RSS 2.0]" border="0"/></a>
+
+</p>
+
+</body>
+</html>
+</xsl:template>
+
+<xsl:template match="atom:entry">
+
+<xsl:copy-of select="atom:content/*"/>
+<br/>
+
+</xsl:template>
+
+</xsl:stylesheet>

Added: public/yanel/trunk/src/realms/yanel-website/paths/img/feed-icon-16x16.png/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/img/feed-icon-16x16.png/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/img/feed-icon-16x16.png/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+img/feed-icon-16x16.png

Added: public/yanel/trunk/src/realms/yanel-website/paths/img/valid-atom.png/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/img/valid-atom.png/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/img/valid-atom.png/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+img/valid-atom.png

Added: public/yanel/trunk/src/realms/yanel-website/paths/img/valid-rss.png/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/img/valid-rss.png/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/img/valid-rss.png/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+img/valid-rss.png

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/index.html/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/index.html/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/index.html/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+news/news.xhtml

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/index.html.yanel-rti/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/index.html.yanel-rti/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/index.html.yanel-rti/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+rtd/news-page.rtd
\ No newline at end of file

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/index.xhtml/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/index.xhtml/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/index.xhtml/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+news/news.xhtml

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-atom.xml/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-atom.xml/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-atom.xml/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+news/introspection-atom.xml

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-index.xml/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-index.xml/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/introspection-index.xml/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+news/introspection-news.xml

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries/phoenix-prototype-1-0.1.8.xml/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+news/news-atom-entries/phoenix-prototype-1-0.1.8.xml

Added: public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries.yanel-rti/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries.yanel-rti/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/news/news-atom-entries.yanel-rti/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+rtd/news-atom-feed.rtd

Added: public/yanel/trunk/src/realms/yanel-website/paths/xslt/news-atom-entries2xhtml.xsl/.yarep-uid
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/paths/xslt/news-atom-entries2xhtml.xsl/.yarep-uid	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/paths/xslt/news-atom-entries2xhtml.xsl/.yarep-uid	2006-11-24 11:00:19 UTC (rev 20300)
@@ -0,0 +1 @@
+xslt/news-atom-entries2xhtml.xsl

Modified: public/yanel/trunk/src/realms/yanel-website/uuid2path.xml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/uuid2path.xml	2006-11-24 10:55:47 UTC (rev 20299)
+++ public/yanel/trunk/src/realms/yanel-website/uuid2path.xml	2006-11-24 11:00:19 UTC (rev 20300)
@@ -8,6 +8,8 @@
   <node uuid="deutsch"               ><name parent-uuid="/">de</name></node>
   <node uuid="documentation"         ><name parent-uuid="/">documentation</name></node>
   <node uuid="documentation.xhtml"   ><name parent-uuid="documentation">index.html</name></node>
+  <node uuid="news"                  ><name parent-uuid="/">news</name></node>
+  <node uuid="news.xhtml"            ><name parent-uuid="news">index.html</name></node>
   <node uuid="download"              ><name parent-uuid="/">download</name></node>
   <node uuid="download.xhtml"        ><name parent-uuid="/">download.html</name></node>
   <node uuid="english"               ><name parent-uuid="/">en</name></node>


