You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/02/08 01:17:12 UTC
svn commit: r1729059 - in /maven/skins/trunk/maven-fluido-skin/src:
it/mskins-22/src/site/ it/mskins-22_default/src/site/
it/mskins-22_topbar/src/site/ it/mskins-23/src/site/ it/mskins-24/src/site/
it/mskins-24_topbar/src/site/ it/mskins-25/src/site/ i...
Author: michaelo
Date: Mon Feb 8 00:17:11 2016
New Revision: 1729059
URL: http://svn.apache.org/viewvc?rev=1729059&view=rev
Log:
[MSKINS-114] Change site.vm when DOXIASITETOOLS-82 has been published
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-22/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -55,7 +55,8 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row-fluid">
<div class="span4">
@@ -77,6 +78,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_default/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -53,7 +53,8 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row-fluid">
<div class="span4">
@@ -75,6 +76,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-22_topbar/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -57,7 +57,8 @@
<menu ref="reports"/>
<footer>
- <div class="row">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row">
<div class="span4">
@@ -79,6 +80,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-23/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -51,7 +51,8 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row-fluid">
<div class="span4">
@@ -73,6 +74,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -55,7 +55,8 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row-fluid">
<div class="span4">
@@ -77,6 +78,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -57,7 +57,8 @@
<menu ref="reports"/>
<footer>
- <div class="row">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row">
<div class="span4">
@@ -79,6 +80,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-25/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -54,8 +54,10 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/sidebar/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -52,7 +52,8 @@
<menu ref="reports"/>
<footer>
- <div class="row-fluid">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row-fluid">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row-fluid">
<div class="span4">
@@ -74,6 +75,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar-inverse/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -71,7 +71,8 @@
<menu ref="reports"/>
<footer>
- <div class="row">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row">
<div class="span4">
@@ -93,6 +94,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml Mon Feb 8 00:17:11 2016
@@ -71,7 +71,8 @@
<menu ref="reports"/>
<footer>
- <div class="row">Apache Maven, Apache @project.name@, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row">Apache Maven, Apache $project.name, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<div class="row">
<div class="span4">
@@ -93,6 +94,7 @@
</address>
</div>
</div>
+ ]]>
</footer>
</body>
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1729059&r1=1729058&r2=1729059&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Mon Feb 8 00:17:11 2016
@@ -1181,15 +1181,7 @@
<div class="row">
#end
#if ( $decoration.body.footer )
- #foreach( $item in $decoration.body.footer.getChildren() )
- #set ( $foot = $item.toString().trim() )
- #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
- #set ( $foot = $StringUtils.replace( $foot.toString(), $documentHeader, "" ) )
- ## Workaround for https://issues.apache.org/jira/browse/MSITE-135
- ## Use StringUtils until https://issues.apache.org/jira/browse/DOXIASITETOOLS-67 is fixed
- ## #eval macro not supported yet, that is a silly turnaround to allow ASF projects adopt fluido
- $StringUtils.replace( $foot, '@project.name@', ${project.name} )
- #end
+ $render.eval( $decoration.body.footer )
#else
#if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
#set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )