Author: hboutemy
Date: Sun Jan 24 19:19:50 2016
New Revision: 1726554
URL: http://svn.apache.org/viewvc?rev=1726554&view=rev
Log:
[DOXIA-535] check that multiple extensions for Markdown work (was not the case
before r1726538)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2-macro.markdown
- copied unchanged from r1725086,
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/markdown2.markdown
(with props)
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown-macro.md
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
Modified:
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=1726554&r1=1726553&r2=1726554&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
Sun Jan 24 19:19:50 2016
@@ -41,6 +41,7 @@ Doxia Formats
| FML | {{{./faq.html} <<<fml/*.fml>>>}} |
{{{./faq-macro.html} macro}} |
*--------------------+-------------------------------------------------------+-----------------------------------+
| Markdown | {{{./markdown.html} <<<markdown/*.md>>>}} |
{{{./markdown-macro.html} macro}} |
+| | {{{./markdown2.html} <<<markdown/*.markdown>>>}} |
{{{./markdown2-macro.html} macro}}|
*--------------------+-------------------------------------------------------+-----------------------------------+
| Xdoc | {{{./xdoc.html} <<<xdoc/*.xml>>>}} |
{{{./xdoc-macro.html} macro}} |
*--------------------+-------------------------------------------------------+-----------------------------------+
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2.markdown
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2.markdown?rev=1726554&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2.markdown
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2.markdown
Sun Jan 24 19:19:50 2016
@@ -0,0 +1,29 @@
+<!---
+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.
+-->
+
+
+Markdown Format works
+---------------
+
+But 'quotes' and "double quotes" were stripped from HTML result with DOXIA 1.3:
+see [DOXIA-473](https://jira.codehaus.org/browse/DOXIA-473).
+
+<!-- MACRO{toc|fromDepth=1|toDepth=2} -->
+
+### Subsection
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/markdown/markdown2.markdown
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1726554&r1=1726553&r2=1726554&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 Jan 24 19:19:50 2016
@@ -36,4 +36,6 @@ content = velocity.text;
assert content.contains( '= <<<val1>>>' ); // MSITE-550
+assert new File( basedir, 'target/site/markdown2.html' ).exists(); // DOXIA-535
+
return true;
\ No newline at end of file
