maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1721071 - in /maven/plugins/trunk/maven-site-plugin/src/it: doxia-formats/ doxia-formats/src/site/apt/ doxia-formats/src/site/fml/ doxia-formats/src/site/markdown/ doxia-formats/src/site/xdoc/ doxia-formats/src/site/xhtml/ markdown-format/
Date Sun, 20 Dec 2015 21:51:30 GMT
Author: hboutemy
Date: Sun Dec 20 21:51:29 2015
New Revision: 1721071

URL: http://svn.apache.org/viewvc?rev=1721071&view=rev
Log:
test every default Doxia format, with macros demo when available

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/
      - copied from r1720900, maven/plugins/trunk/maven-site-plugin/src/it/markdown-format/
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
  (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
  (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown.md
      - copied unchanged from r1720900, maven/plugins/trunk/maven-site-plugin/src/it/markdown-format/src/site/markdown/index.md
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt  
(with props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
  (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml   (with
props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt 
 (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml.xhtml
Removed:
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/index.md
    maven/plugins/trunk/maven-site-plugin/src/it/markdown-format/
Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy

Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml?rev=1721071&r1=1720900&r2=1721071&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml Sun Dec 20 21:51:29
2015
@@ -24,10 +24,10 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.site.its</groupId>
-  <artifactId>markdown-format</artifactId>
+  <artifactId>doxia-formats</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>markdown-format</name>
+  <name>Doxia formats tests</name>
 
 
   <build>

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,43 @@
+ -----
+ Macros in APT
+ -----
+ Hervé Boutemy
+ -----
+ 2015-12-20
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Macros in APT
+
+~~ START SNIPPET: macros
+* TOC Macro
+
+%{toc}
+
+* Echo Macro
+
+%{echo|param1=value1|param2=value2}
+
+* Snippet Macro
+
+%{snippet|id=macros|file=src/site/apt/apt-macro.apt}
+~~ END SNIPPET: macros

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/apt-macro.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt Sun
Dec 20 21:51:29 2015
@@ -0,0 +1,21 @@
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+APT

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt Sun
Dec 20 21:51:29 2015
@@ -0,0 +1,54 @@
+ -----
+ Doxia Formats
+ -----
+ Hervé Boutemy
+ -----
+ 2015-12-20
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Doxia Formats
+
+  See {{{http://maven.apache.org/doxia/references/index.html} Doxia Markup Languages References}}
for a list of
+  Markup Languages that support Doxia Parser.
+
+  By default, only the following are integrated into maven-site-plugin:
+
+*--------------------*-------------------------------------------------------*-----------------------------------*
+|| Format            || plain                                                || macro   
                        ||
+*--------------------+-------------------------------------------------------+-----------------------------------+
+| Apt                | {{{./index.html} <<<apt/*.apt>>>}}             
      | {{{./apt-macro.html} macro}}      |
+*--------------------+-------------------------------------------------------+-----------------------------------+
+| FML                | {{{./faq.html} <<<fml/*.fml>>>}}               
      |                                   |
+*--------------------+-------------------------------------------------------+-----------------------------------+
+| Markdown           | {{{./markdown.html} <<<markdown/*.md>>>}}      
      | {{{./markdown-macro.html} macro}} |
+*--------------------+-------------------------------------------------------+-----------------------------------+
+| Xdoc               | {{{./xdoc.html} <<<xdoc/*.xml>>>}}             
      | {{{./xdoc-macro.html} macro}}     |
+*--------------------+-------------------------------------------------------+-----------------------------------+
+| XHTML              | {{{./xhtml.html} <<<xhtml/*.xhtml>>>}}         
      | {{{./xhtml-macro.html} macro}}    |
+*--------------------+-------------------------------------------------------+-----------------------------------+
+
+  Other formats, either provided by Doxia itself (Confluence, Simplified DocBook, TWiki)
+  or tierce parties ({{{http://asciidoctor.org/docs/asciidoctor-maven-plugin/#maven-site-integration}
AsciiDoc}}),
+  require to explicitely add a dependency to maven-site-plugin when using it.
+
+Velocity

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml Sun Dec
20 21:51:29 2015
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+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.
+-->
+
+<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.1 file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.1.xsd"
+  title="Oft Asked Questions">
+
+  <part id="contributing">
+    <!-- A comment -->
+    <title>Contributing</title>
+
+    <faq id="stupid-question">
+      <question>One <b>stupid</b> question &amp; a silly answer?</question>
+      <answer>
+        <p>
+          A paragraph with a <a href="#Using_Maven">local link</a>,
+          a link to another <a href="./cdc.html">source document</a>,
+          an <a href="http://maven.apache.org/?l=a&amp;m=b">external link</a>
+          with entities, an <i>italic</i> text and <b>non-US-ASCII characters:
àéèç</b>.
+        </p>
+      </answer>
+    </faq>
+
+  </part>
+
+  <part id="using">
+    <title>Using Maven</title>
+
+    <faq id="disable-reports">
+      <question>How do I disable a report on my site?</question>
+      <answer>
+        <p>
+          Test nested <code>&lt;source&gt;&lt;/source&gt;</code>
tags (DOXIA-16):
+        </p>
+        <source><![CDATA[<source>1.5</source>]]></source>
+      </answer>
+    </faq>
+
+  </part>
+
+</faqs>
+

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt Sun
Dec 20 21:51:29 2015
@@ -0,0 +1,21 @@
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+FML

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,21 @@
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Markdown

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,35 @@
+<!---
+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.
+-->
+
+Macros in Markdown
+----------------
+
+<!-- START SNIPPET: macros -->
+### TOC Macro
+
+<!-- MACRO{toc} -->
+
+### Echo Macro
+
+<!-- MACRO{echo|param1=value1|param2=value2} -->
+
+### Snippet Macro
+
+<!-- MACRO{snippet|id=macros|file=src/site/markdown/markdown-macro.md} -->
+<!-- END SNIPPET: macros -->

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt Sun
Dec 20 21:51:29 2015
@@ -0,0 +1,21 @@
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Xdoc

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,50 @@
+<?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/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>Macros in Xdoc</title>
+    <author email="hboutemy@apache.org">Hervé Boutemy</author>
+  </properties>
+  <body>
+    <section name="Macros in Xdoc">
+    <!-- START SNIPPET: macros -->
+    <subsection name="TOC">
+      <macro name="toc">
+      </macro>
+    </subsection>
+    <subsection name="Echo">
+      <macro name="echo">
+        <param name="param1" value="value1"/>
+        <param name="param2" value="value2"/>
+      </macro>
+    </subsection>
+    <subsection name="Snippet">
+      <macro name="snippet">
+        <param name="id" value="macros"/>
+        <param name="file" value="src/site/xdoc/xdoc-macro.xml"/>
+      </macro>
+    </subsection>
+    <!-- END SNIPPET: macros -->
+    </section>
+  </body>
+</document>

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc-macro.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml Sun
Dec 20 21:51:29 2015
@@ -0,0 +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/xsd/xdoc-2.0.xsd">
+
+  <properties>
+    <title>Title</title>
+    <author>Author</author>
+    <date>Date</date>
+  </properties>
+
+  <body>
+
+    <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>
+        <h5>Sub-sub-sub-section</h5>
+        <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>
+            </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>
+            </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">
+          <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>
+
+</document>

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt Sun
Dec 20 21:51:29 2015
@@ -0,0 +1,21 @@
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+XHTML

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/ignore.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml-macro.xhtml?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml-macro.xhtml
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+  <title>Macro in XHTML</title>
+  <meta name="author" content="Author" />
+  <meta name="date" content="2015-12-20" />
+</head>
+
+<body>
+
+<h2>Macros in XHTML</h2>
+
+<!-- START SNIPPET: macros -->
+<h3>TOC Macro</h3>
+
+<!-- MACRO{toc} -->
+
+<h3>Echo Macro</h3>
+
+<!-- MACRO{echo|param1=value1|param2=value2} -->
+
+<h3>Snippet Macro</h3>
+
+<!-- MACRO{snippet|id=macros|file=src/site/xhtml/xhtml-macro.xhtml} -->
+<!-- END SNIPPET: macros -->
+
+</body>
+
+</html>

Added: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml.xhtml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml.xhtml?rev=1721071&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml.xhtml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/xhtml/xhtml.xhtml
Sun Dec 20 21:51:29 2015
@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+  <title>Title</title>
+  <meta name="author" content="Author" />
+  <meta name="date" content="Date" />
+</head>
+
+<body>
+
+<p>Paragraph 1, line 1. Paragraph 1, line 2.</p>
+<p>Paragraph 2, line 1. Paragraph 2, line 2.</p>
+
+<div class="section"><h2>Section title</h2>
+<div class="section"><h3>Sub-section title</h3>
+<div class="section"><h4>Sub-sub-section title</h4>
+<div class="section"><h5>Sub-sub-sub-section title</h5>
+<div class="section"><h6>Sub-sub-sub-sub-section title</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>
+    </ul>
+  </li>
+  <li>List item 3. Force end of list:</li>
+</ul>
+
+<div class="source"><pre>Verbatim text not contained in list item 3</pre></div>
+
+<ol type="1">
+  <li>Numbered item 1.
+    <ol type="A">
+      <li>Numbered item A.</li>
+      <li>Numbered item B.</li>
+    </ol>
+  </li>
+  <li>Numbered item 2.</li>
+</ol>
+
+<p>List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]].</p>
+
+<dl>
+  <dt>Defined term 1</dt>
+  <dd>of definition list.</dd>
+  <dt>Defined term 2</dt>
+  <dd>of definition list.<div class="source"><pre>Verbatim text
+                        in a box        </pre></div></dd>
+</dl>
+
+<p>--- instead of +-- suppresses the box around verbatim text.</p>
+
+<div class="figure">
+  <p align="center"><img src="figure.png" alt="figure.png" /></p>
+  <p align="center"><i>Figure caption</i></p>
+</div>
+
+<table align="center" border="1" class="bodyTable">
+  <caption>Table caption</caption>
+    <tr class="a">
+      <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 class="b">
+      <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" border="0" class="bodyTable">
+    <tr class="a">
+      <td align="center">cell</td>
+      <td align="center">cell</td>
+    </tr>
+    <tr class="b">
+      <td align="center">cell</td>
+      <td align="center">cell</td>
+    </tr>
+</table>
+
+<p>Horizontal line:</p><hr />
+
+<!-- PB -->
+<p>New page.</p>
+
+<p><i>Italic</i> font. <b>Bold</b> font. <tt>Monospaced</tt>
font.</p>
+
+<p>
+  <a name="Anchor">Anchor</a>.
+  Link to <a href="#Anchor">Anchor</a>.
+  Link to <a href="http://www.pixware.fr" class="externalLink">http://www.pixware.fr</a>.
+  Link to <a href="#Anchor">showing alternate text</a>.
+  Link to <a href="http://www.pixware.fr" class="externalLink">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>
+
+<!-- A comment! -->
+
+</div></div></div></div></div>
+
+</body>
+
+</html>

Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy?rev=1721071&r1=1720900&r2=1721071&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy Sun Dec 20 21:51:29
2015
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-content = new File( basedir, 'target/site/index.html' ).text;
+content = new File( basedir, 'target/site/markdown.html' ).text;
 
 assert content.contains( 'Markdown Format works' );
 
@@ -27,4 +27,7 @@ assert !content.contains( ' quotes and d
 assert !content.contains( 'MACRO' );
 assert content.contains( 'href="#Subsection"' );
 
+ignore = new File( basedir, 'target/site/ignore.txt' );
+assert !ignore.exists();
+
 return true;
\ No newline at end of file




Mime
View raw message