velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
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 GMT
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 @@
       ]]></description>
       <version>1.0.0</version>
       <fields>
-        <field xml.listStyle="flat">
-          <name>item</name>
+        <field xml.listStyle="wrapped">
+          <name>items</name>
+          <version>1.0.0</version>
           <description><![CDATA[
-            A news item.
+            These are the news items to display.
           ]]></description>
-          <version>1.0.0</version>
           <association>
             <type>Item</type>
             <multiplicity>*</multiplicity>

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 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://velocity.apache.org/NEWS/1.0.0" xmlns="http://velocity.apache.org/NEWS/1.0.0">
   <xs:element name="news" type="NewsModel">
     <xs:annotation>
       <xs:documentation source="version">1.0.0</xs:documentation>
@@ -18,11 +18,11 @@
       </xs:documentation>
     </xs:annotation>
     <xs:all>
-      <xs:element name="item" minOccurs="0">
+      <xs:element name="items" minOccurs="0">
         <xs:annotation>
           <xs:documentation source="version">1.0.0</xs:documentation>
           <xs:documentation source="description">
-            A news item.
+            These are the news items to display.
           </xs:documentation>
         </xs:annotation>
         <xs:complexType>
@@ -88,4 +88,4 @@
       </xs:element>
     </xs:all>
   </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

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 @@
   </p>
       <source>
 &lt;<a href="#class_news">news</a>&gt;
-  &lt;<a href="#class_item">item</a> id=.. &gt;
-    &lt;date/&gt;
-    &lt;headline/&gt;
-    &lt;text/&gt;
-    &lt;categories/&gt;
-  &lt;/item&gt;
+  &lt;items&gt;
+    &lt;<a href="#class_item">item</a> id=.. &gt;
+      &lt;date/&gt;
+      &lt;headline/&gt;
+      &lt;text/&gt;
+      &lt;categories/&gt;
+    &lt;/item&gt;
+  &lt;/items&gt;
 &lt;/news&gt;
 </source>
       <a name="class_news"/>
@@ -35,10 +37,10 @@
           </tr>
           <tr>
             <td>
-              <code>item</code>
+              <code>items</code>
             </td>
-            <td><b>List</b>  
-            A news item.
+            <td>
+            These are the news items to display.
           </td>
           </tr>
         </table>
@@ -97,4 +99,4 @@
       </subsection>
     </section>
   </body>
-</document>
+</document>
\ No newline at end of file



Mime
View raw message