Author: gertv
Date: Sun May 30 11:53:17 2010
New Revision: 949503
URL: http://svn.apache.org/viewvc?rev=949503&view=rev
Log:
Use a variable list instead of a glossary list
Modified:
servicemix/maven-plugins/docs-maven-plugin/trunk/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
Modified:
servicemix/maven-plugins/docs-maven-plugin/trunk/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
URL:
http://svn.apache.org/viewvc/servicemix/maven-plugins/docs-maven-plugin/trunk/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java?rev=949503&r1=949502&r2=949503&view=diff
==============================================================================
---
servicemix/maven-plugins/docs-maven-plugin/trunk/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
(original)
+++
servicemix/maven-plugins/docs-maven-plugin/trunk/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
Sun May 30 11:53:17 2010
@@ -85,14 +85,13 @@ public class ConfluenceConverter {
}
private void writeGlossaryList(String line) {
- ensureElementOpen("glosslist");
+ ensureElementOpen("variablelist");
String[] keyvalue = line.substring(1).trim().split("::");
- openElement("glossentry");
- writeElement("glossterm", filter(keyvalue[0].trim()));
- openElement("glossdef");
- writeElement("para", filter(keyvalue[1].trim()));
- closeElement("glossentry");
+ openElement("varlistentry");
+ writeElement("term", filter(keyvalue[0].trim()));
+ writeListItem(keyvalue[1]);
+ closeElement("varlistentry");
}
private void writeTableBody(String line) {
@@ -120,7 +119,7 @@ public class ConfluenceConverter {
private void writeNumberedList(String line) {
ensureElementOpen("orderedlist");
- writeListItem(line);
+ writeListItem(line.substring(1));
}
private void ensureElementOpen(String element) {
@@ -131,13 +130,12 @@ public class ConfluenceConverter {
private void writeBulletList(String line) {
ensureElementOpen("itemizedlist");
- writeListItem(line);
+ writeListItem(line.substring(1));
}
- private void writeListItem(String line) {
- String data = line.substring(1).trim();
+ private void writeListItem(String data) {
openElement("listitem");
- writeElement("para", filter(data));
+ writeElement("para", filter(data.trim()));
closeElement("listitem");
}
Modified:
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
URL:
http://svn.apache.org/viewvc/servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki?rev=949503&r1=949502&r2=949503&view=diff
==============================================================================
---
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
(original)
+++
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.wiki
Sun May 30 11:53:17 2010
@@ -12,8 +12,8 @@ This section contains a numbered list:
# {{item 2}}
# item 3
-h2. Definition list
-This section contains a definition list:
+h2. Variable list
+This section contains a variable list:
- term1 :: Definition for term1
- {{term2}} :: Definition for term2 (including {{code text}})
- term3 :: Definition for term3
Modified:
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
URL:
http://svn.apache.org/viewvc/servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml?rev=949503&r1=949502&r2=949503&view=diff
==============================================================================
---
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
(original)
+++
servicemix/maven-plugins/docs-maven-plugin/trunk/src/test/resources/org/apache/servicemix/docs/confluence/lists.xml
Sun May 30 11:53:17 2010
@@ -35,29 +35,29 @@
</para>
</section>
<section>
- <title>Definition list</title>
+ <title>Variable list</title>
<para>
- This section contains a definition list:
- <glosslist>
- <glossentry>
- <glossterm>term1</glossterm>
- <glossdef>
+ This section contains a variable list:
+ <variablelist>
+ <varlistentry>
+ <term>term1</term>
+ <listitem>
<para>Definition for term1</para>
- </glossdef>
- </glossentry>
- <glossentry>
- <glossterm><code>term2</code></glossterm>
- <glossdef>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><code>term2</code></term>
+ <listitem>
<para>Definition for term2 (including <code>code
text</code>)</para>
- </glossdef>
- </glossentry>
- <glossentry>
- <glossterm>term3</glossterm>
- <glossdef>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>term3</term>
+ <listitem>
<para>Definition for term3</para>
- </glossdef>
- </glossentry>
- </glosslist>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</para>
</section>
</chapter>
\ No newline at end of file
