Return-Path: Delivered-To: apmail-velocity-commits-archive@locus.apache.org Received: (qmail 44312 invoked from network); 7 Jan 2007 16:01:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jan 2007 16:01:53 -0000 Received: (qmail 93153 invoked by uid 500); 7 Jan 2007 16:02:00 -0000 Delivered-To: apmail-velocity-commits-archive@velocity.apache.org Received: (qmail 93127 invoked by uid 500); 7 Jan 2007 16:02:00 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 93117 invoked by uid 99); 7 Jan 2007 16:02:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 08:02:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 08:01:52 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 1B4F81A981A; Sun, 7 Jan 2007 08:00:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r493759 - in /velocity/site/tools/velocity-site-news: extension/src/main/java/org/apache/velocity/site/news/macro/ extension/src/main/mdo/ plugin/src/main/java/org/apache/velocity/site/news/plugin/ src/site/resources/xsd/ src/site/xdoc/ Date: Sun, 07 Jan 2007 16:00:53 -0000 To: commits@velocity.apache.org From: henning@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070107160054.1B4F81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: henning Date: Sun Jan 7 08:00:53 2007 New Revision: 493759 URL: http://svn.apache.org/viewvc?view=rev&rev=493759 Log: Move items in sublist, add correction to XSD (modello has xmlns hardcoded, ugh. :-( ) Modified: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java velocity/site/tools/velocity-site-news/src/site/resources/xsd/news-1.0.0.xsd velocity/site/tools/velocity-site-news/src/site/xdoc/news.xml Modified: velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java?view=diff&rev=493759&r1=493758&r2=493759 ============================================================================== --- velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java (original) +++ velocity/site/tools/velocity-site-news/extension/src/main/java/org/apache/velocity/site/news/macro/VelocityNewsMacro.java Sun Jan 7 08:00:53 2007 @@ -75,7 +75,7 @@ } }, Locale.ENGLISH); - List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItem()); + List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItems()); int count = 0; for(Iterator it = items.iterator(); it.hasNext() && count < maxCount; count++ ) { Modified: velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo?view=diff&rev=493759&r1=493758&r2=493759 ============================================================================== --- velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo (original) +++ velocity/site/tools/velocity-site-news/extension/src/main/mdo/news.mdo Sun Jan 7 08:00:53 2007 @@ -23,12 +23,12 @@ ]]> 1.0.0 - - item + + items + 1.0.0 - 1.0.0 Item * Modified: velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java?view=diff&rev=493759&r1=493758&r2=493759 ============================================================================== --- velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java (original) +++ velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/VelocityNewsReport.java Sun Jan 7 08:00:53 2007 @@ -68,7 +68,7 @@ newsPageGenerator.openPage(); newsPageGenerator.displayHeader(); - List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItem()); + List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItems()); for(Iterator it = items.iterator(); it.hasNext(); ) { Item newsItem = (Item) it.next(); @@ -89,7 +89,7 @@ newsFeedGenerator.openFeed(); - List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItem()); + List items = VelocityNewsUtils.sortItemsByReverseDate(newsModel.getItems()); for(Iterator it = items.iterator(); it.hasNext(); ) { Item newsItem = (Item) it.next(); Modified: velocity/site/tools/velocity-site-news/src/site/resources/xsd/news-1.0.0.xsd URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/src/site/resources/xsd/news-1.0.0.xsd?view=diff&rev=493759&r1=493758&r2=493759 ============================================================================== --- velocity/site/tools/velocity-site-news/src/site/resources/xsd/news-1.0.0.xsd (original) +++ velocity/site/tools/velocity-site-news/src/site/resources/xsd/news-1.0.0.xsd Sun Jan 7 08:00:53 2007 @@ -1,5 +1,5 @@ - + 1.0.0 @@ -18,11 +18,11 @@ - + 1.0.0 - A news item. + These are the news items to display. @@ -88,4 +88,4 @@ - \ No newline at end of file + Modified: velocity/site/tools/velocity-site-news/src/site/xdoc/news.xml URL: http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/src/site/xdoc/news.xml?view=diff&rev=493759&r1=493758&r2=493759 ============================================================================== --- velocity/site/tools/velocity-site-news/src/site/xdoc/news.xml (original) +++ velocity/site/tools/velocity-site-news/src/site/xdoc/news.xml Sun Jan 7 08:00:53 2007 @@ -14,12 +14,14 @@

<news> - <item id=.. > - <date/> - <headline/> - <text/> - <categories/> - </item> + <items> + <item id=.. > + <date/> + <headline/> + <text/> + <categories/> + </item> + </items> </news> @@ -35,10 +37,10 @@ - item + items - List - A news item. + + These are the news items to display. @@ -97,4 +99,4 @@ - + \ No newline at end of file