Author: yradtsevich Date: 2010-07-09 11:33:20 -0400 (Fri, 09 Jul 2010) New Revision: 23351 Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml Removed: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-6586 : VPE JUnits failed: child of node X must be H1 - VPE template files for docbook have been renamed according to standard VPE naming convention: vpe-templates-*.xml Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml 2010-07-09 15:16:41 UTC (rev 23350) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml 2010-07-09 15:33:20 UTC (rev 23351) @@ -5,10 +5,10 @@ point="org.jboss.tools.vpe.templates"> <templates name="Web Deployment Descriptor" - path="templates/docbook.xml"></templates> + path="templates/vpe-templates-docbook.xml"></templates> <templates name="XInclude" - path="templates/xinclude.xml"> + path="templates/vpe-templates-xinclude.xml"> </templates> </extension> Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2010-07-09 15:16:41 UTC (rev 23350) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2010-07-09 15:33:20 UTC (rev 23351) @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/--> - - <vpe:tag name="chapter" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="section" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="sect1" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - <vpe:tag name="sect2" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - <vpe:tag name="title" case-sensitive="yes"> - <vpe:template children="no" modify="yes"> - <h1> - <vpe:value expr="{tagtext()}" /> - </h1> - </vpe:template> - </vpe:tag> - <vpe:tag name="para" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <p /> - </vpe:template> - </vpe:tag> - <vpe:tag name="itemizedlist" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <ul /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="listitem" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <li /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="ulink" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <a href="{@url}" /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="programlisting" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <pre /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="emphasis" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <em /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="tgroup" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <table border="1px" /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="row" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <tr /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="entry" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <td /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="property" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <i /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="imagedata" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <img src="{src(@fileref)}" /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="mediaobject" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - <vpe:tag name="imageobject" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - <vpe:tag name="figure" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div /> - </vpe:template> - </vpe:tag> - <vpe:tag name="orderedlist" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <ol /> - </vpe:template> - </vpe:tag> - <vpe:tag case-sensitive="yes" name="chapterinfo"> - <vpe:template children="yes" modify="yes"> - <vpe:any display="none" icon="no" value="{name()}" /> - </vpe:template> - </vpe:tag> - <vpe:tag case-sensitive="yes" name="note"> - <vpe:template children="yes" modify="yes"> - <vpe:any background-color="yellow" border="blue" icon="no" /> - </vpe:template> - </vpe:tag> -</vpe:templates> \ No newline at end of file Copied: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml (from rev 23234, trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-07-09 15:33:20 UTC (rev 23351) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> +<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/--> + + <vpe:tag name="chapter" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="section" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="sect1" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + <vpe:tag name="sect2" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + <vpe:tag name="title" case-sensitive="yes"> + <vpe:template children="no" modify="yes"> + <h1> + <vpe:value expr="{tagtext()}" /> + </h1> + </vpe:template> + </vpe:tag> + <vpe:tag name="para" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <p /> + </vpe:template> + </vpe:tag> + <vpe:tag name="itemizedlist" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <ul /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="listitem" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <li /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="ulink" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <a href="{@url}" /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="programlisting" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <pre /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="emphasis" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <em /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="tgroup" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <table border="1px" /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="row" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <tr /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="entry" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <td /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="property" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <i /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="imagedata" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <img src="{src(@fileref)}" /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="mediaobject" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + <vpe:tag name="imageobject" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + <vpe:tag name="figure" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + <vpe:tag name="orderedlist" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <ol /> + </vpe:template> + </vpe:tag> + <vpe:tag case-sensitive="yes" name="chapterinfo"> + <vpe:template children="yes" modify="yes"> + <vpe:any display="none" icon="no" value="{name()}" /> + </vpe:template> + </vpe:tag> + <vpe:tag case-sensitive="yes" name="note"> + <vpe:template children="yes" modify="yes"> + <vpe:any background-color="yellow" border="blue" icon="no" /> + </vpe:template> + </vpe:tag> +</vpe:templates> \ No newline at end of file Copied: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml (from rev 23234, trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-07-09 15:33:20 UTC (rev 23351) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" /> + + <vpe:tag name="xi:include" case-sensitive="yes"> + <vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/> + </vpe:tag> +</vpe:templates> \ No newline at end of file Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2010-07-09 15:16:41 UTC (rev 23350) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2010-07-09 15:33:20 UTC (rev 23351) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" /> - - <vpe:tag name="xi:include" case-sensitive="yes"> - <vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/> - </vpe:tag> -</vpe:templates> \ No newline at end of file