svn commit: r784740 - in /maven/doxia: doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/ doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/ doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/ doxia/tru...

Mon, 15 Jun 2009 04:51:57 -0700 

Author: vsiveton
Date: Mon Jun 15 11:51:28 2009
New Revision: 784740

URL: http://svn.apache.org/viewvc?rev=784740&view=rev
Log:
DOXIA-281: Add macro support in FML

o updated doc to use xsd 1.0.1

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/faq.fml
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
    
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/test.fml
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/apt/using-fml-xsd.apt
    
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/faq.fml
    maven/doxia/site/src/site/fml/faq.fml
    maven/doxia/site/src/site/xdoc/references/fml-format.xml

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/faq.fml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/faq.fml
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/fml/faq.fml
 Mon Jun 15 11:51:28 2009
@@ -19,9 +19,9 @@
 under the License.
 -->
 
-<faqs xmlns="http://maven.apache.org/FML/1.0";
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.xsd"
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.1.xsd"
   title="Frequently Asked Questions">
   <part id="General">
     <faq id="How_to_handle_style_in_the_APT_markup_language">

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
 Mon Jun 15 11:51:28 2009
@@ -18,9 +18,9 @@
 under the License.
 -->
 
-<faqs xmlns="http://maven.apache.org/FML/1.0";
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.xsd"
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.1.xsd"
   title="Oft Asked Questions">
 
   <part id="contributing">

Modified: 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/test.fml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/test.fml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/test.fml
 (original)
+++ 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/resources/unit/fml/test.fml
 Mon Jun 15 11:51:28 2009
@@ -19,9 +19,9 @@
 -->
 
 <!-- TODO [later]: faqs need some sorting -->
-<faqs xmlns="http://maven.apache.org/FML/1.0";
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.xsd"
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.1.xsd"
   title="Frequently Asked Questions">
 
   <part id="general">

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml Mon Jun 15 
11:51:28 2009
@@ -121,7 +121,7 @@
 
                     <mkdir dir="${dir}"/>
 
-                    <xsddoc file="${basedir}/src/main/resources/fml-1.0.xsd" 
out="${dir}" doctitle="Reference of Schema FML 1.0" verbose="true"/>
+                    <xsddoc file="${basedir}/src/main/resources/fml-1.0.1.xsd" 
out="${dir}" doctitle="Reference of Schema FML 1.0.1" verbose="true"/>
                   </tasks>
                 </configuration>
                 <goals>

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/apt/using-fml-xsd.apt
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/apt/using-fml-xsd.apt?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/apt/using-fml-xsd.apt
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/site/apt/using-fml-xsd.apt
 Mon Jun 15 11:51:28 2009
@@ -28,15 +28,15 @@
 
 Using Schema FML 1.0
 
-  The FML XSD is located {{{http://maven.apache.org/xsd/fml-1.0.xsd}here}}.
+  The FML XSD is located {{{http://maven.apache.org/xsd/fml-1.0.1.xsd}here}}.
 
   Your favorite IDE probably supports XSD schema's for .fml files. You need to 
specify the following:
 
 +-----+
 
-<faqs xmlns="http://maven.apache.org/FML/1.0";
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
http://maven.apache.org/xsd/fml-1.0.xsd";
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
http://maven.apache.org/xsd/fml-1.0.1.xsd";
   title="...">
 ...
 </faqs>

Modified: 
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/faq.fml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/faq.fml
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-test-docs/src/main/resources/doxia-site/fml/faq.fml
 Mon Jun 15 11:51:28 2009
@@ -79,7 +79,7 @@
       <answer>
         <p>
           The Xdoc XSD is located <a 
href="http://maven.apache.org/xsd/xdoc-2.0.xsd";>here</a> and
-          the FML XSD is located <a 
href="http://maven.apache.org/xsd/fml-1.0.xsd";>here</a>.
+          the FML XSD is located <a 
href="http://maven.apache.org/xsd/fml-1.0.1.xsd";>here</a>.
         </p>
         <p>
           Your favorite IDE probably supports XSD schema's for Xdoc and FML 
files. You need to
@@ -91,9 +91,9 @@
   ...
 &lt;/document&gt;</source>
         <source>
-&lt;faqs xmlns="http://maven.apache.org/FML/1.0";
+&lt;faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
http://maven.apache.org/xsd/fml-1.0.xsd"&gt;
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
http://maven.apache.org/xsd/fml-1.0.1.xsd"&gt;
   ...
 &lt;/faqs&gt;</source>
         </p>

Modified: maven/doxia/site/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/src/site/fml/faq.fml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- maven/doxia/site/src/site/fml/faq.fml (original)
+++ maven/doxia/site/src/site/fml/faq.fml Mon Jun 15 11:51:28 2009
@@ -90,7 +90,7 @@
           <dt>Xdoc XSD 2.0</dt>
           <dd><a 
href="http://maven.apache.org/xsd/xdoc-2.0.xsd";>http://maven.apache.org/xsd/xdoc-2.0.xsd</a></dd>
           <dt>FML XSD 1.0</dt>
-          <dd><a 
href="http://maven.apache.org/xsd/fml-1.0.xsd";>http://maven.apache.org/xsd/fml-1.0.xsd</a></dd>
+          <dd><a 
href="http://maven.apache.org/xsd/fml-1.0.1.xsd";>http://maven.apache.org/xsd/fml-1.0.1.xsd</a></dd>
           <dt>Book XSD 1.0</dt>
           <dd><a 
href="http://maven.apache.org/xsd/book-1.0.0.xsd";>http://maven.apache.org/xsd/book-1.0.0.xsd</a></dd>
           <dt>Document XSD 1.0</dt>
@@ -109,9 +109,9 @@
   ...
 &lt;/document&gt;</source>
         <source>
-&lt;faqs xmlns="http://maven.apache.org/FML/1.0";
+&lt;faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
http://maven.apache.org/xsd/fml-1.0.xsd"&gt;
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
http://maven.apache.org/xsd/fml-1.0.1.xsd"&gt;
   ...
 &lt;/faqs&gt;</source>
           <source>

Modified: maven/doxia/site/src/site/xdoc/references/fml-format.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/site/src/site/xdoc/references/fml-format.xml?rev=784740&r1=784739&r2=784740&view=diff
==============================================================================
--- maven/doxia/site/src/site/xdoc/references/fml-format.xml (original)
+++ maven/doxia/site/src/site/xdoc/references/fml-format.xml Mon Jun 15 
11:51:28 2009
@@ -49,9 +49,9 @@
           The following is a sample FML document:
         </p>
         <source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0";
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0 
http://maven.apache.org/xsd/fml-1.0.xsd";
+  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 
http://maven.apache.org/xsd/fml-1.0.1.xsd";
   title="Frequently Asked Questions"
   toplink="false">

Reply via email to