Author: hboutemy
Date: Sat Apr 9 11:11:21 2016
New Revision: 1738351
URL: http://svn.apache.org/viewvc?rev=1738351&view=rev
Log:
[MSITE-768] added an IT for #include and #parse: seems #parse does not work in
site (in Doxia Siterenderer, there is an IT that shows that #parse works for
skin template)...
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
(with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
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=1738351&r1=1738350&r2=1738351&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
Sat Apr 9 11:11:21 2016
@@ -54,4 +54,6 @@ Doxia Formats
Velocity
- See {{{./velocity-context.html} Doxia Site Renderer Velocity Context demo}}.
\ No newline at end of file
+ See {{{./velocity-context.html} Doxia Site Renderer Velocity Context demo}}.
+
+ See also {{{./velocity-include-parse.html} Velocity #parse and #include
demo}}.
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm?rev=1738351&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
Sat Apr 9 11:11:21 2016
@@ -0,0 +1,37 @@
+ -----
+ Doxia Site Renderer Velocity ${esc.h}parse and ${esc.h}include
+ -----
+ Hervé Boutemy
+ -----
+ 2016-04-09
+ -----
+
+~~ 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 Site Renderer Velocity ${esc.h}parse and ${esc.h}include
+
+* ${esc.h}include
+
+#include( "velocity-include.txt" )
+
+* ${esc.h}parse
+
+##parse( "velocity-parse.txt" )
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include-parse.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt?rev=1738351&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
Sat Apr 9 11:11:21 2016
@@ -0,0 +1,23 @@
+~~ 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
+
+ <<<velocity-include.txt>>> content
+
+ no Velocity expressions are interpreted, like #parse or ## comment
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-include.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt?rev=1738351&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
Sat Apr 9 11:11:21 2016
@@ -0,0 +1,23 @@
+## 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
+
+ <<<velocity-parse.txt>>> content
+
+## parsed comments are real comments
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity.parse.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
