Index: pom.xml =================================================================== --- pom.xml (revision 784532) +++ pom.xml (working copy) @@ -75,6 +75,23 @@ + + org.codehaus.plexus + plexus-maven-plugin + + + src/main/components/components.xml + target/generated-resources/plexus/META-INF/plexus/components.xml + + + + + + merge-descriptors + + + + Index: src/main/components/components.xml =================================================================== --- src/main/components/components.xml (revision 0) +++ src/main/components/components.xml (revision 0) @@ -0,0 +1,36 @@ + + + + + + + org.apache.maven.doxia.parser.Parser + fml + org.apache.maven.doxia.module.fml.FmlParser + Parse an xdoc model and emit events into the specified doxia Sink. + + + org.apache.maven.doxia.macro.manager.MacroManager + macroManager + + + + + Property changes on: src\main\components\components.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Index: src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java =================================================================== --- src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java (revision 784532) +++ src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java (working copy) @@ -36,11 +36,11 @@ public interface FmlMarkup extends HtmlMarkup { - /** FML namespace: "http://maven.apache.org/FML/1.0" */ - String FML_NAMESPACE = "http://maven.apache.org/FML/1.0"; + /** FML namespace: "http://maven.apache.org/FML/1.0.1" */ + String FML_NAMESPACE = "http://maven.apache.org/FML/1.0.1"; - /** FML system id: "http://maven.apache.org/xsd/fml-1.0.xsd" */ - String FML_SYSTEM_ID = "http://maven.apache.org/xsd/fml-1.0.xsd"; + /** FML system id: "http://maven.apache.org/xsd/fml-1.0.1.xsd" */ + String FML_SYSTEM_ID = "http://maven.apache.org/xsd/fml-1.0.1.xsd"; // ---------------------------------------------------------------------- // Specific Fml tags @@ -105,4 +105,14 @@ return "source"; } }; + + /** Fml tag for macro */ + Tag MACRO_TAG = new Tag() + { + /** {@inheritDoc} */ + public String toString() + { + return "macro"; + } + }; } Index: src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java =================================================================== --- src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (revision 784532) +++ src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (working copy) @@ -19,7 +19,10 @@ * under the License. */ +import java.io.IOException; import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; import java.util.HashMap; import java.util.Iterator; @@ -30,16 +33,21 @@ import javax.swing.text.html.HTML.Attribute; import org.apache.maven.doxia.macro.MacroExecutionException; +import org.apache.maven.doxia.macro.MacroRequest; +import org.apache.maven.doxia.macro.manager.MacroNotFoundException; import org.apache.maven.doxia.module.fml.model.Faq; import org.apache.maven.doxia.module.fml.model.Faqs; import org.apache.maven.doxia.module.fml.model.Part; import org.apache.maven.doxia.parser.AbstractXmlParser; import org.apache.maven.doxia.parser.ParseException; +import org.apache.maven.doxia.sink.AbstractSink; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.XhtmlBaseSink; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.HtmlTools; +import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -73,14 +81,40 @@ * Using to reduce warn messages. */ private Map warnMessages; + /** The source content of the input reader. Used to pass into macros. */ + private String sourceContent; + + /** A macro name. */ + private String macroName; + + /** The macro parameters. */ + private Map macroParameters = new HashMap(); + /** {@inheritDoc} */ public void parse( Reader source, Sink sink ) throws ParseException { + try + { + StringWriter contentWriter = new StringWriter(); + IOUtil.copy( source, contentWriter ); + sourceContent = contentWriter.toString(); + } + catch ( IOException ex ) + { + throw new ParseException( "Error reading the input source: " + ex.getMessage(), ex ); + } + finally + { + IOUtil.close( source ); + } + + Reader tmp = new StringReader( sourceContent ); + this.faqs = new Faqs(); // this populates faqs - super.parse( source, sink ); + super.parse( tmp, sink ); writeFaqs( sink ); @@ -178,6 +212,19 @@ .append( String.valueOf( GREATER_THAN ) ); } + + // ---------------------------------------------------------------------- + // Macro + // ---------------------------------------------------------------------- + + else if ( parser.getName().equals( MACRO_TAG.toString() ) ) + { + handleMacroStart( parser ); + } + else if ( parser.getName().equals( PARAM.toString() ) ) + { + handleParamStart( parser, sink ); + } else if ( buffer != null ) { buffer.append( String.valueOf( LESS_THAN ) ).append( parser.getName() ); @@ -272,6 +319,17 @@ buffer = null; } + else if ( parser.getName().equals( MACRO_TAG.toString() ) ) + { + handleMacroEnd( buffer ); + } + else if ( parser.getName().equals( PARAM.toString() ) ) + { + if ( !StringUtils.isNotEmpty( macroName ) ) + { + handleUnknown( parser, sink, TAG_TYPE_END ); + } + } else if ( buffer != null ) { if ( buffer.length() > 0 && buffer.charAt( buffer.length() - 1 ) == SPACE ) @@ -356,6 +414,88 @@ } } + private void handleMacroStart( XmlPullParser parser ) + throws MacroExecutionException + { + if ( !isSecondParsing() ) + { + macroName = parser.getAttributeValue( null, Attribute.NAME.toString() ); + + if ( macroParameters == null ) + { + macroParameters = new HashMap(); + } + + if ( StringUtils.isEmpty( macroName ) ) + { + throw new MacroExecutionException( "The '" + Attribute.NAME.toString() + + "' attribute for the '" + MACRO_TAG.toString() + "' tag is required." ); + } + } + } + + private void handleMacroEnd( StringBuffer buffer ) + throws MacroExecutionException + { + if ( !isSecondParsing() ) + { + if ( StringUtils.isNotEmpty( macroName ) ) + { + // TODO handles specific macro attributes + macroParameters.put( "sourceContent", sourceContent ); + FmlParser fmlParser = new FmlParser(); + fmlParser.setSecondParsing( true ); + macroParameters.put( "parser", fmlParser ); + + MacroRequest request = new MacroRequest( macroParameters, getBasedir() ); + + try + { + StringWriter sw = new StringWriter(); + XhtmlBaseSink sink = new XhtmlBaseSink(sw); + executeMacro( macroName, request, sink ); + sink.close(); + buffer.append( sw.toString() ); + } catch ( MacroNotFoundException me ) + { + throw new MacroExecutionException( "Macro not found: " + macroName, me ); + } + } + } + + // Reinit macro + macroName = null; + macroParameters = null; + } + + private void handleParamStart( XmlPullParser parser, Sink sink ) + throws MacroExecutionException + { + if ( !isSecondParsing() ) + { + if ( StringUtils.isNotEmpty( macroName ) ) + { + String paramName = parser.getAttributeValue( null, Attribute.NAME.toString() ); + String paramValue = parser.getAttributeValue( null, + Attribute.VALUE.toString() ); + + if ( StringUtils.isEmpty( paramName ) || StringUtils.isEmpty( paramValue ) ) + { + throw new MacroExecutionException( "'" + Attribute.NAME.toString() + + "' and '" + Attribute.VALUE.toString() + "' attributes for the '" + PARAM.toString() + + "' tag are required inside the '" + MACRO_TAG.toString() + "' tag." ); + } + + macroParameters.put( paramName, paramValue ); + } + else + { + // param tag from non-macro object, see MSITE-288 + handleUnknown( parser, sink, TAG_TYPE_START ); + } + } + } + /** * Writes the faqs to the specified sink. * Index: src/main/resources/fml-1.0.1.xsd =================================================================== --- src/main/resources/fml-1.0.1.xsd (revision 784532) +++ src/main/resources/fml-1.0.1.xsd (working copy) @@ -22,14 +22,14 @@ - Doxia FML (FAQ Markup Language) 1.0 XML Schema. + Doxia FML (FAQ Markup Language) 1.0.1 XML Schema. This is based on: Extensible HTML version 1.0 Transitional XML Schema http://www.w3.org/2002/08/xhtml/xhtml1-transitional.xsd @@ -449,6 +449,7 @@ + @@ -2909,4 +2910,19 @@ + + + + 1.0.1 + + A macro element. + + + + + + + + + \ No newline at end of file Index: src/main/resources/fml-1.0.xsd =================================================================== --- src/main/resources/fml-1.0.xsd (revision 784532) +++ src/main/resources/fml-1.0.xsd (working copy) @@ -1,2912 +0,0 @@ - - - - - - - - - Doxia FML (FAQ Markup Language) 1.0 XML Schema. - - This is based on: Extensible HTML version 1.0 Transitional XML Schema - http://www.w3.org/2002/08/xhtml/xhtml1-transitional.xsd - - For further information, see: - http://maven.apache.org/doxia/references/fml-format.html - - - - - - - - ================ Character mnemonic entities ========================= - - XHTML entity sets are identified by the PUBLIC and SYSTEM identifiers: - - PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN" - SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" - - PUBLIC "-//W3C//ENTITIES Special for XHTML//EN" - SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent" - - PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN" - SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent" - - - - - - ================== Imported Names ==================================== - - - - - - - media type, as per [RFC2045] - - - - - - - - - comma-separated list of media types, as per [RFC2045] - - - - - - - - - a character encoding, as per [RFC2045] - - - - - - - - - a space separated list of character encodings, as per [RFC2045] - - - - - - - - - a language code, as per [RFC3066] - - - - - - - - - a single character, as per section 2.2 of [XML] - - - - - - - - - - - one or more digits - - - - - - - - - - - tabindex attribute specifies the position of the current element - in the tabbing order for the current document. This value must be - a number between 0 and 32767. User agents should ignore leading zeros. - - - - - - - - - - - - space-separated list of link types - - - - - - - - - single or comma-separated list of media descriptors - - - - - - - - - - - a Uniform Resource Identifier, see [RFC2396] - - - - - - - - - a space separated list of Uniform Resource Identifiers - - - - - - - - - date and time information. ISO date format - - - - - - - - - script expression - - - - - - - - - style sheet data - - - - - - - - - used for titles etc. - - - - - - - - - render in this frame - - - - - - - - - - - nn for pixels or nn% for percentage length - - - - - - - - - - - pixel, percentage, or relative - - - - - - - - - - - integer representing length in pixels - - - - - - - - these are used for image maps - - - - - - - - - - - - - - - - comma separated list of lengths - - - - - - - - - - - used for object, applet, img, input and iframe - - - - - - - - - - - - - - - a color using sRGB: #RRGGBB as Hex values - - There are also 16 widely known color names with their sRGB values: - - Black = #000000 Green = #008000 - Silver = #C0C0C0 Lime = #00FF00 - Gray = #808080 Olive = #808000 - White = #FFFFFF Yellow = #FFFF00 - Maroon = #800000 Navy = #000080 - Red = #FF0000 Blue = #0000FF - Purple = #800080 Teal = #008080 - Fuchsia= #FF00FF Aqua = #00FFFF - - - - - - - - - - =================== Generic Attributes =============================== - - - - - - - core attributes common to most elements - id document-wide unique id - class space separated list of classes - style associated style info - title advisory title/amplification - - - - - - - - - - - - internationalization attributes - lang language code (backwards compatible) - xml:lang language code (as per XML 1.0 spec) - dir direction for weak/neutral text - - - - - - - - - - - - - - - - - - attributes for common UI events - onclick a pointer button was clicked - ondblclick a pointer button was double clicked - onmousedown a pointer button was pressed down - onmouseup a pointer button was released - onmousemove a pointer was moved onto the element - onmouseout a pointer was moved away from the element - onkeypress a key was pressed and released - onkeydown a key was pressed down - onkeyup a key was released - - - - - - - - - - - - - - - - - - attributes for elements that can get the focus - accesskey accessibility key character - tabindex position in tabbing order - onfocus the element got the focus - onblur the element lost the focus - - - - - - - - - - - - - - - - - - text alignment for p, div, h1-h6. The default is - align="left" for ltr headings, "right" for rtl - - - - - - - - - - - - - - - - - =================== Text Elements ==================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - these can only occur at block level - - - - - - - - - - - - - these can only occur at block level - - - - - - - - - - - - - - - - - - - - - - "Inline" covers inline or "text-level" element - - - - - - - - - - - ================== Block level elements ============================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "Flow" mixes block and inline and is used for list items etc. - - - - - - - - - - - - - ================== Content models for exclusions ===================== - - - - - - - a elements use "Inline" excluding a - - - - - - - - - - - - - - - pre uses "Inline" excluding img, object, applet, big, small, - font, or basefont - - - - - - - - - - - - - - - - form uses "Flow" excluding form - - - - - - - - - - - - - button uses "Flow" but excludes a, form, form controls, iframe - - - - - - - - - - - - - - - - - - - - - - - - - ================ Document Head ======================================= - - - - - - - - - - - - - - - - - - - - content model is "head.misc" combined with a single - title and an optional base element in any order - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The title element is not considered part of the flow of text. - It should be displayed, for example as the page header or - window title. Exactly one title is required per document. - - - - - - - - - - - - document base URI - - - - - - - - - - - - - generic metainformation - - - - - - - - - - - - - - - - Relationship values can be used in principle: - - a) for document specific toolbars/menus when used - with the link element in document head e.g. - start, contents, previous, next, index, end, help - b) to link to a separate style sheet (rel="stylesheet") - c) to make a link to a script (rel="script") - d) by stylesheets to control how collections of - html nodes are rendered into printed documents - e) to make a link to a printable version of this document - e.g. a PostScript or PDF version (rel="alternate" media="print") - - - - - - - - - - - - - - - - - - - style info, which may include CDATA sections - - - - - - - - - - - - - - - - script statements, which may include CDATA sections - - - - - - - - - - - - - - - - - - - - - - - alternate content container for non script-based rendering - - - - - - - - - - - - - - ======================= Frames ======================================= - - - - - - - inline subwindow - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - alternate content container for non frame-based rendering - - - - - - - - - - - - - - =================== Document Body ==================================== - - - - - - - generic language/style container - - - - - - - - - - - - - - - =================== Paragraphs ======================================= - - - - - - - - - - - - - - - - - =================== Headings ========================================= - - There are six levels of headings from h1 (the most important) - to h6 (the least important). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================== Lists ============================================ - - - - - - - Unordered list bullet styles - - - - - - - - - - - - - Unordered list - - - - - - - - - - - - - - - - - - - - - - Ordered list numbering style - - 1 arabic numbers 1, 2, 3, ... - a lower alpha a, b, c, ... - A upper alpha A, B, C, ... - i lower roman i, ii, iii, ... - I upper roman I, II, III, ... - - The style is applied to the sequence number which by default - is reset to 1 for the first list item in an ordered list. - - - - - - - - - Ordered (numbered) list - - - - - - - - - - - - - - - - - - - - - - - single column list (DEPRECATED) - - - - - - - - - - - - - - - - - - - - - multiple column list (DEPRECATED) - - - - - - - - - - - - - - - - - - - - - LIStyle is constrained to: "(ULStyle|OLStyle)" - - - - - - - - - list item - - - - - - - - - - - - - - - - definition lists - dt for term, dd for its definition - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================== Address ========================================== - - - - - - - information on author - - - - - - - - - - - - - - - =================== Horizontal Rule ================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================== Preformatted Text ================================ - - - - - - - content is "Inline" excluding - "img|object|applet|big|small|sub|sup|font|basefont" - - - - - - - - - - - - - - - - =================== Block-like Quotes ================================ - - - - - - - - - - - - - - - - - =================== Text alignment =================================== - - - - - - - center content - - - - - - - - - - - - - - =================== Inserted/Deleted Text ============================ - - ins/del are allowed in block and inline content, but its - inappropriate to include block content within an ins element - occurring in inline content. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================== The Anchor Element ================================ - - - - - - - content is "Inline" except that anchors shouldn't be nested - - - - - - - - - - - - - - - - - - - - - - - - - ===================== Inline Elements ================================ - - - - - - - generic language/style container - - - - - - - - - - - - - - - I18N BiDi over-ride - - - - - - - - - - - - - - - - - - - - - - - - - - forced line break - - - - - - - - - - - - - - - - - - - - - emphasis - - - - - - - - - - - - - - - strong emphasis - - - - - - - - - - - - - - - definitional - - - - - - - - - - - - - - - program code - - - - - - - - - - - - - - - sample - - - - - - - - - - - - - - - something user would type - - - - - - - - - - - - - - - variable - - - - - - - - - - - - - - - citation - - - - - - - - - - - - - - - abbreviation - - - - - - - - - - - - - - - acronym - - - - - - - - - - - - - - - inlined quote - - - - - - - - - - - - - - - - subscript - - - - - - - - - - - - - - - superscript - - - - - - - - - - - - - - - fixed pitch font - - - - - - - - - - - - - - - italic font - - - - - - - - - - - - - - - bold font - - - - - - - - - - - - - - - bigger font - - - - - - - - - - - - - - - smaller font - - - - - - - - - - - - - - - underline - - - - - - - - - - - - - - - strike-through - - - - - - - - - - - - - - - strike-through - - - - - - - - - - - - - - - base font size - - - - - - - - - - - - - - local change to font - - - - - - - - - - - - - - - - - - ==================== Object ====================================== - - object is used to embed objects as part of HTML pages. - param elements should precede other content. Parameters - can also be expressed as attribute/value pairs on the - object element itself when brevity is desired. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param is used to supply a named property value. - In XML it would seem natural to follow RDF and support an - abbreviated syntax where the param elements are replaced - by attribute value pairs on the object start tag. - - - - - - - - - - - - - - - - - - - - - - =================== Java applet ================================== - - One of code or object attributes must be present. - Place param elements before other content. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================== Images =========================================== - - To avoid accessibility problems for people who aren't - able to see the image, you should provide a text - description using the alt and longdesc attributes. - In addition, avoid the use of server-side image maps. - - - - - - - - - - - - - - - - usemap points to a map element which may be in this document - or an external document, although the latter is not widely supported - - - - - - - - - - - - - - - - - - - - ================== Client-side image maps ============================ - - These can be placed in the same document or grouped in a - separate document although this isn't yet widely supported - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================ Forms =============================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Each label must not contain more than ONE field - Label elements shouldn't be nested. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - form control - - - - - - - - - - the name attribute is required for all but submit & reset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - option selector - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - option group - - - - - - - - - - - - - - - - - - - - - - selectable choice - - - - - - - - - - - - - - - - - - - - - - - - - - - multi-line text field - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The fieldset element is used to group form fields. - Only one legend element should occur in the content - and if present should only be preceded by whitespace. - - NOTE: this content model is different from the XHTML 1.0 DTD, - closer to the intended content model in HTML4 DTD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fieldset label - - - - - - - - - - - - - - - - - Content is "Flow" excluding a, form and form controls - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - single-line text input control (DEPRECATED) - - - - - - - - - - - - ======================= Tables ======================================= - - Derived from IETF HTML table standard, see [RFC1942] - - - - - - - The border attribute sets the thickness of the frame around the - table. The default units are screen pixels. - - The frame attribute specifies which parts of the frame around - the table should be rendered. The values are not the same as - CALS to avoid a name clash with the valign attribute. - - - - - - - - - - - - - - - - - - - The rules attribute defines which rules to draw between cells: - - If rules is absent then assume: - "none" if border is absent or border="0" otherwise "all" - - - - - - - - - - - - - - - horizontal placement of table relative to document - - - - - - - - - - - - - horizontal alignment attributes for cell contents - - char alignment char, e.g. char=':' - charoff offset for alignment char - - - - - - - - - - - - - - - - - - - - - vertical alignment attributes for cell contents - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Use thead to duplicate headers when breaking table - across page boundaries, or for static headers when - tbody sections are rendered in scrolling panel. - - Use tfoot to duplicate footers when breaking table - across page boundaries, or for static footers when - tbody sections are rendered in scrolling panel. - - Use multiple tbody sections when rules are needed - between groups of table rows. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - colgroup groups a set of col elements. It allows you to group - several semantically related columns together. - - - - - - - - - - - - - - - - - - col elements define the alignment properties for cells in - one or more columns. - - The width attribute specifies the width of the columns, e.g. - - width=64 width in screen pixels - width=0.5* relative width of 0.5 - - The span attribute causes the attributes of one - col element to apply to more than one column. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Scope is simpler than headers attribute for common tables - - - - - - - - - - - - - th is for headers, td for data and for cells acting as both - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ================== FML Specific ===================================== - - - - - - ================ Document Structure ================================== - - - - - - 1.0.0 - - The <faqs/> element is the root of the FML descriptor. - - - - - - - 1.0.0 - - Required part element for this faqs element. - - - - - - - - 1.0.0 - - The identifier for this faqs element. - - - - - - 1.0.0 - - The title for this faqs element. - - - - - - 1.0.0 - - Boolean to generate optionally [top] links. - - - - - - - - - 1.0 - - A part element of the faqs element. - - - - - - - 1.0.0 - - Optional title for this part element. - - - - - - 1.0.0 - - Required faq element for this part element. - - - - - - - 1.0.0 - - The identifier for this part element. - - - - - - - - - 1.0.0 - - A faq element. - - - - - - - 1.0.0 - - The question of this faq element. - - - - - - 1.0.0 - - The answer of this faq element. - - - - - - - 1.0.0 - - The identifier of this faq element. - - - - - - - - - 1.0.0 - - A faq question element. - - - - - - - - - - - - - 1.0.0 - - A faq answer element. - - - - - - - - - - - - - - - ================ Document Addons ===================================== - See "special.extra" group. - - - - - - 1.0.0 - - A source element. - - - - - - - - - \ No newline at end of file Index: src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java =================================================================== --- src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java (revision 784532) +++ src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java (working copy) @@ -38,7 +38,7 @@ extends AbstractXmlValidatorTest { /** The xsd to use */ - private static final File FML_XSD = new File( getBasedir(), "/src/main/resources/fml-1.0.xsd" ); + private static final File FML_XSD = new File( getBasedir(), "/src/main/resources/fml-1.0.1.xsd" ); /** {@inheritDoc} */ protected void setUp() Index: src/test/resources/simpleFaq.fml =================================================================== --- src/test/resources/simpleFaq.fml (revision 784532) +++ src/test/resources/simpleFaq.fml (working copy) @@ -18,9 +18,9 @@ under the License. --> - Index: src/test/resources/test.fml =================================================================== --- src/test/resources/test.fml (revision 784532) +++ src/test/resources/test.fml (working copy) @@ -19,9 +19,9 @@ --> -