maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r736641 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources: macro.xml report.xml test.xml toc.xml
Date Thu, 22 Jan 2009 13:54:59 GMT
Author: vsiveton
Date: Thu Jan 22 05:54:59 2009
New Revision: 736641

URL: http://svn.apache.org/viewvc?rev=736641&view=rev
Log:
o added XSD in the test resources
o fixed xml according the xsd

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/test.xml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml?rev=736641&r1=736640&r2=736641&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml Thu
Jan 22 05:54:59 2009
@@ -18,18 +18,19 @@
 under the License.
 -->
 
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 file:../../main/resources/xdoc-2.0.xsd">
   <properties>
     <title>Test DOXIA-77</title>
     <author email="vsiveton@apache.org">Vincent Siveton</author>
   </properties>
   <body>
-      <p>
-        Test DOXIA-77
-      </p>
+    <section name="Test DOXIA-77">
       <macro name="snippet">
         <param name="id" value="superpom"/>
         <param name="url" value="http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/pom-4.0.0.xml"/>
       </macro>
+    </section>
   </body>
 </document>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml?rev=736641&r1=736640&r2=736641&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml
Thu Jan 22 05:54:59 2009
@@ -17,20 +17,25 @@
 under the License.
 -->
 
-<document>
-<properties>
-<author>meeper</author>
-<title>Synchronization report for Codehaus</title>
-</properties>
-<body>
-<section name="Synchronization report for Codehaus">
-<table>
-<tr>
-<th>Artifact</th>
-<th>Size (in bytes)</th>
-<th>Date</th>
-</tr>
-</table>
-<p><a href="codehaus-2004-08-29.txt">Raw report</a></p></section>
-</body>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 file:../../main/resources/xdoc-2.0.xsd">
+  <properties>
+    <title>Synchronization report for Codehaus</title>
+    <author>meeper</author>
+  </properties>
+  <body>
+    <section name="Synchronization report for Codehaus">
+      <table>
+        <tr>
+          <th>Artifact</th>
+          <th>Size (in bytes)</th>
+          <th>Date</th>
+        </tr>
+      </table>
+      <p>
+        <a href="codehaus-2004-08-29.txt">Raw report</a>
+      </p>
+    </section>
+  </body>
 </document>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/test.xml?rev=736641&r1=736640&r2=736641&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/test.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/test.xml Thu
Jan 22 05:54:59 2009
@@ -1,134 +1,137 @@
 <?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  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.
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 file:../../main/resources/xdoc-2.0.xsd">
 
-<document>
-
-<properties>
+  <properties>
     <title>Title</title>
     <author>Author</author>
     <date>Date</date>
-</properties>
+  </properties>
 
-<body>
+  <body>
 
-  <p>Paragraph 1, line 1. Paragraph 1, line 2.</p>
-  <p>Paragraph 2, line 1. Paragraph 2, line 2.</p>
+    <section name="Some Paragraph">
+      <p>Paragraph 1, line 1. Paragraph 1, line 2.</p>
+      <p>Paragraph 2, line 1. Paragraph 2, line 2.</p>
+    </section>
 
-  <section name="Section title">
-    <subsection name="Sub-section title">
-      <h4>Sub-sub-section title</h4>
+    <section name="Section title">
+      <subsection name="Sub-section title">
+        <h4>Sub-sub-section title</h4>
         <h5>Sub-sub-sub-section</h5>
-          <h6>Sub-sub-sub-sub-section</h6>
+        <h6>Sub-sub-sub-sub-section</h6>
 
-    <ul>
-      <li>List item 1.</li>
-      <li>List item 2.
-        <p>Paragraph contained in list item 2.</p>
         <ul>
-          <li>Sub-list item 1.</li>
-          <li>Sub-list item 2.</li>
+          <li>List item 1.</li>
+          <li>List item 2. <p>Paragraph contained in list item 2.</p>
+            <ul>
+              <li>Sub-list item 1.</li>
+              <li>Sub-list item 2.</li>
+            </ul>
+          </li>
+          <li>List item 3. Force end of list:</li>
         </ul>
-      </li>
-      <li>List item 3. Force end of list:</li>
-    </ul>
-
-    <source>Verbatim text not contained in list item 3</source>
-
-    <ol style="list-style-type: decimal">
-      <li>Numbered item 1.
-        <ol style="list-style-type: upper-alpha">
-          <li>Numbered item A.</li>
-          <li>Numbered item B.</li>
+
+        <source>Verbatim text not contained in list item 3</source>
+
+        <ol style="list-style-type: decimal">
+          <li>Numbered item 1. <ol style="list-style-type: upper-alpha">
+              <li>Numbered item A.</li>
+              <li>Numbered item B.</li>
+            </ol>
+          </li>
+          <li>Numbered item 2.</li>
         </ol>
-      </li>
-      <li>Numbered item 2.</li>
-    </ol>
-
-    <p>List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].</p>
-
-    <dl compact="compact">
-      <dt><b>Defined term 1</b></dt>
-      <dd>of definition list.</dd>
-      <dt><b>Defined term 2</b></dt>
-      <dd>of definition list.
-<source>Verbatim text
-                            in a box        </source>
-      </dd>
-    </dl>
-
-    <p>--- instead of +-- suppresses the box around verbatim text.</p>
-
-    <img src="figure" alt="Figure caption" />
-
-    <table align="center">
-      <table align="center" border="1">
-        <tr valign="top">
-          <th align="center">Centered<br />cell 1,1</th>
-          <th align="left">Left-aligned<br />cell 1,2</th>
-          <th align="right">Right-aligned<br />cell 1,3</th>
-        </tr>
-        <tr valign="top">
-          <td align="center">cell 2,1</td>
-          <td align="left">cell 2,2</td>
-          <td align="right">cell 2,3</td>
-        </tr>
-      </table>
-    <p><i>Table caption</i></p>
-    </table>
-
-    <p>No grid, no caption:</p>
-
-    <table align="center">
-      <table align="center" border="0">
-        <tr valign="top">
-          <td align="center">cell</td>
-          <td align="center">cell</td>
-        </tr>
-        <tr valign="top">
-          <td align="center">cell</td>
-          <td align="center">cell</td>
-        </tr>
-      </table>
-    </table>
-
-    <p>Horizontal line:</p>
-    <hr />
-
-    <p>New page.</p>
-
-    <p><i>Italic</i> font. <b>Bold</b> font. <tt>Monospaced</tt>
font.</p>
-
-    <p>
-      <a id="anchor" name="anchor">Anchor</a>.
-      Link to <a href="#anchor">Anchor</a>.
-      Link to <a href="http://www.pixware.fr">http://www.pixware.fr</a>.
-      Link to <a href="#anchor">showing alternate text</a>.
-      Link to <a href="http://www.pixware.fr">Pixware home page</a>.
-    </p>
-
-    <p>Force line<br />break.</p>
-
-    <p>Non&#160;breaking&#160;space.</p>
-
-    <p>Escaped special characters:<br />
-      ~<br />
-      =<br />
-      -<br />
-      +<br />
-      *<br />
-      [<br />
-      ]<br />
-      &lt;<br />
-      &gt;<br />
-      {<br />
-      }<br />
-      \
-    </p>
 
-    <p>Copyright symbol: &#169; &#169; &#169;.</p>
+        <p>List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].</p>
+
+        <dl compact="compact">
+          <dt>
+            <b>Defined term 1</b>
+          </dt>
+          <dd>of definition list.</dd>
+          <dt>
+            <b>Defined term 2</b>
+          </dt>
+          <dd>of definition list. <source>Verbatim text in a box </source>
+          </dd>
+        </dl>
+
+        <p>--- instead of +-- suppresses the box around verbatim text.</p>
+
+        <img src="figure" alt="Figure caption"/>
+
+        <table align="center">
+          <caption>Table caption</caption>
+          <tr valign="top">
+            <th align="center">Centered<br/>cell 1,1</th>
+            <th align="left">Left-aligned<br/>cell 1,2</th>
+            <th align="right">Right-aligned<br/>cell 1,3</th>
+          </tr>
+          <tr valign="top">
+            <td align="center">cell 2,1</td>
+            <td align="left">cell 2,2</td>
+            <td align="right">cell 2,3</td>
+          </tr>
+        </table>
+
+        <p>No grid, no caption:</p>
+
+        <table align="center">
+          <tr valign="top">
+            <td align="center">cell</td>
+            <td align="center">cell</td>
+          </tr>
+          <tr valign="top">
+            <td align="center">cell</td>
+            <td align="center">cell</td>
+          </tr>
+        </table>
+
+        <p>Horizontal line:</p>
+        <hr/>
+
+        <p>New page.</p>
+
+        <p><i>Italic</i> font. <b>Bold</b> font. <tt>Monospaced</tt>
font.</p>
+
+        <p>
+          <a id="anchor" name="anchor">Anchor</a>. Link to <a href="#anchor">Anchor</a>.
+          Link to <a href="http://www.pixware.fr">http://www.pixware.fr</a>.
Link to <a
+            href="#anchor">showing alternate text</a>. Link to <a
+            href="http://www.pixware.fr">Pixware home page</a>. </p>
+
+        <p>Force line<br/>break.</p>
+
+        <p>Non&#160;breaking&#160;space.</p>
+
+        <p>Escaped special characters:<br/> ~<br/> =<br/> -<br/>
+<br/> *<br/> [<br/> ]<br/>
+          &lt;<br/> &gt;<br/> {<br/> }<br/> \ </p>
+
+        <p>Copyright symbol: &#169; &#169; &#169;.</p>
 
       </subsection>
     </section>
 
-</body>
+  </body>
 
 </document>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml?rev=736641&r1=736640&r2=736641&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml Thu
Jan 22 05:54:59 2009
@@ -18,51 +18,33 @@
 under the License.
 -->
 
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 file:../../main/resources/xdoc-2.0.xsd">
   <properties>
     <title>Test DOXIA-40</title>
     <author email="vsiveton@apache.org">Vincent Siveton</author>
   </properties>
   <body>
+    <section name="Section 1">
+      <p>Test DOXIA-40</p>
+      <p> Section 1 </p>
       <p>
-        Test DOXIA-40
+        <macro name="toc">
+          <param name="section" value="1"/>
+          <param name="fromDepth" value="1"/>
+          <param name="toDepth" value="2"/>
+        </macro>
       </p>
-      <section name="Section 1">
-        <p>
-          Section 1
-        </p>
-        <p>
-          <macro name="toc">
-           <param name="section" value="1"/>
-           <param name="fromDepth" value="1"/>
-           <param name="toDepth" value="2"/>
-          </macro>
-        </p>
-        <subsection name="Section 11">
-          <p>
-            Section 11
-          </p>
-        </subsection>
-        <subsection name="Section 12">
-          <p>
-            Section 12
-          </p>
-          <subsection name="Section 121">
-            <p>
-              Section 121
-            </p>
-            <subsection name="Section 1211">
-              <p>
-                Section 1211
-              </p>
-            </subsection>
-          </subsection>
-        </subsection>
-        <subsection name="Section 13">
-          <p>
-            Section 13
-          </p>
-        </subsection>
-      </section>
+      <subsection name="Section 11">
+        <p> Section 11 </p>
+      </subsection>
+      <subsection name="Section 12">
+        <p> Section 12 </p>
+      </subsection>
+      <subsection name="Section 13">
+        <p> Section 13 </p>
+      </subsection>
+    </section>
   </body>
 </document>



Mime
View raw message