svn commit: r1189641 - in /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources: META-INF/maven/site.vm css/maven-base.css css/maven-theme.css
Author: simonetripodi
Date: Thu Oct 27 07:18:06 2011
New Revision: 1189641
URL: http://svn.apache.org/viewvc?rev=1189641view=rev
Log:
top bar excluded by default but can be enabled by setting
custom.fluidoSkin.topBarEnabled=true in site.xml - Contributed by Ivan Habunek
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1189641r1=1189640r2=1189641view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Thu Oct 27 07:18:06 2011
@@ -495,6 +495,14 @@
meta http-equiv=Content-Type content=text/html;
charset=${outputEncoding} /
title$title/title
link rel=stylesheet href=$relativePath/css/bootstrap-1.3.0.min.css /
+#if ( $decoration.custom.getChild( 'fluidoSkin' )
+ $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'topBarEnabled' )
+ $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'topBarEnabled' ).getValue() )
+#set( $topBarEnabled = true )
+stylebody{padding-top: 60px;}/style
+#else
+stylebody{padding-top: 20px;}/style
+#end
link rel=stylesheet href=$relativePath/css/maven-base.css /
link rel=stylesheet href=$relativePath/css/maven-theme.css /
@@ -568,6 +576,7 @@
#googleAnalytics( $decoration.googleAnalyticsAccountId )
/head
body
+#if ( $topBarEnabled )
div id=topbar class=topbar data-dropdown=dropdown
div class=topbar-inner
div class=container-fluid
@@ -587,6 +596,7 @@
/div
/div
/div
+#end
div class=container-fluid
#if ( ($decoration.bannerLeft.name $decoration.bannerLeft.name !=
$project.name || $decoration.bannerLeft.src || $decoration.bannerLeft.href ) ||
$decoration.bannerRight )
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css?rev=1189641r1=1189640r2=1189641view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
Thu Oct 27 07:18:06 2011
@@ -19,4 +19,6 @@
/* $Id$ */
-body{padding-top: 60px;}
+.clear{clear:both;visibility: hidden;}
+.clear hr{display: none;}
+.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left:
7px;}
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1189641r1=1189640r2=1189641view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css
Thu Oct 27 07:18:06 2011
@@ -19,10 +19,6 @@
/* $Id$ */
-.clear{clear:both;visibility: hidden;}
-.clear hr{display: none;}
-.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left:
7px;}
-
/*IE6/7 don't support selectors*/
a.externalLink{background: url('../images/external.png') right center
no-repeat;padding-right: 18px;}
a.newWindow{background: url('../images/newwindow.png') right center
no-repeat;padding-right: 18px;}
svn commit: r1189664 - /maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml
Author: olamy Date: Thu Oct 27 08:24:45 2011 New Revision: 1189664 URL: http://svn.apache.org/viewvc?rev=1189664view=rev Log: use released version Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml?rev=1189664r1=1189663r2=1189664view=diff == --- maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml (original) +++ maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml Thu Oct 27 08:24:45 2011 @@ -125,7 +125,7 @@ under the License. dependency groupIdcom.carrotsearch/groupId artifactIdjunit-benchmarks/artifactId -version0.3.0-SNAPSHOT/version +version0.3.0/version /dependency dependency groupIdcom.h2database/groupId @@ -239,4 +239,4 @@ under the License. /repositories -/project \ No newline at end of file +/project
svn commit: r1189756 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: simonetripodi
Date: Thu Oct 27 13:43:31 2011
New Revision: 1189756
URL: http://svn.apache.org/viewvc?rev=1189756view=rev
Log:
added the option to disable the sidebar (and change the layout!), use
custom.fluidoSkin.sideBarEnabled = false - Thanks to both Ivan and Olivier for
the hints!
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1189756r1=1189755r2=1189756view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Thu Oct 27 13:43:31 2011
@@ -598,7 +598,19 @@
/div
#end
+#if ( $decoration.custom.getChild('fluidoSkin')
+ $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
+ 'false' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sideBarEnabled' ).getValue() )
+#set ( $sideBarEnabled = false )
+#else
+#set ( $sideBarEnabled = true )
+#end
+
+#if ( $sideBarEnabled )
div class=container-fluid
+#else
+div class=container
+#end
#if ( ($decoration.bannerLeft.name $decoration.bannerLeft.name !=
$project.name || $decoration.bannerLeft.src || $decoration.bannerLeft.href ) ||
$decoration.bannerRight )
div id=banner
div class=pull-left#banner( $decoration.bannerLeft bannerLeft
)/div
@@ -614,6 +626,7 @@
/ul
/div
+ #if ( $sideBarEnabled )
div id=leftColumn class=sidebar
div class=well
#publishDate( navigation-top $decoration.publishDate
$decoration.version )
@@ -624,6 +637,7 @@
#poweredByLogo( $decoration.poweredBy )
/div
/div
+ #end
div id=bodyColumn class=content
div id=contentBox
@@ -642,6 +656,11 @@
p$StringUtils.replace( $foot, '@project.name@', ${project.name}
)/p
#end
#end
+#if ( !$sideBarEnabled )
+p id=poweredBy class=pull-right
+ #poweredByLogo( $decoration.poweredBy )
+/p
+#end
/div
/footer
/body
svn commit: r1189766 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: simonetripodi
Date: Thu Oct 27 14:02:37 2011
New Revision: 1189766
URL: http://svn.apache.org/viewvc?rev=1189766view=rev
Log:
resize the topbar/footer depending on the sidebar is enabled or not
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1189766r1=1189765r2=1189766view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Thu Oct 27 14:02:37 2011
@@ -578,10 +578,22 @@
#googleAnalytics( $decoration.googleAnalyticsAccountId )
/head
body
+#if ( $decoration.custom.getChild('fluidoSkin')
+ $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
+ 'false' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sideBarEnabled' ).getValue() )
+#set ( $sideBarEnabled = false )
+#else
+#set ( $sideBarEnabled = true )
+#end
+
#if ( $topBarEnabled )
div id=topbar class=topbar data-dropdown=dropdown
div class=topbar-inner
+#if ( $sideBarEnabled )
div class=container-fluid
+#else
+div class=container
+#end
ul
#topMenu( $decoration.body.menus )
/ul
@@ -600,14 +612,10 @@
/div
#end
-#if ( $decoration.custom.getChild('fluidoSkin')
- $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
- 'false' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sideBarEnabled' ).getValue() )
-#set ( $sideBarEnabled = false )
-div class=container
-#else
-#set ( $sideBarEnabled = true )
+#if ( $sideBarEnabled )
div class=container-fluid
+#else
+div class=container
#end
#if ( ($decoration.bannerLeft.name $decoration.bannerLeft.name !=
$project.name || $decoration.bannerLeft.src || $decoration.bannerLeft.href ) ||
$decoration.bannerRight )
div id=banner
@@ -645,7 +653,11 @@
/div
footer class=footer
+ #if ( $sideBarEnabled )
div class=container-fluid
+ #else
+ div class=container
+ #end
pCopyright copy;#copyright()All Rights Reserved.#publishDate(
bottom $decoration.publishDate $decoration.version )/p
## turnaround for
#if ( $decoration.custom.getChild(footer) )
svn commit: r1189789 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Author: simonetripodi
Date: Thu Oct 27 14:45:30 2011
New Revision: 1189789
URL: http://svn.apache.org/viewvc?rev=1189789view=rev
Log:
added skin configuration details
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1189789r1=1189788r2=1189789view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Thu Oct 27 14:45:30 2011
@@ -9,6 +9,7 @@
${skinName} test
This is a test for ${skinName}.
+ ${skinName} is an Apache Maven site skin built on top of Twitter's bootstrap.
* Usage
@@ -27,6 +28,30 @@ ${skinName} test
/project
+-+
+ The skin supports different layouts, enabling/disabling the left sidebar menu
and the topbar menu.
+ Users have just play with flags in the custom/fluidoSkin element in
site.xml.
+
++-+
+custom
+ fluidoSkin
+topBarEnabledtrue/topBarEnabled
+sideBarEnabledfalse/sideBarEnabled
+ /fluidoSkin
+/custom
++-+
+
+ That allows users having 4 skins in only 1!
+
+ [[1]] sidebar only;
+
+ [[2]] topbar only;
+
+ [[3]] both side/top bars;
+
+ [[4]] none at all.
+
+ Default skin setting is the option 1.
+
Sample content
Paragraph 1, line 1.
svn commit: r1189910 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Author: rfscholte
Date: Thu Oct 27 18:13:37 2011
New Revision: 1189910
URL: http://svn.apache.org/viewvc?rev=1189910view=rev
Log:
Fix MNGSITE-143: typos on Introduction to the Dependency Mechanism-page
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=1189910r1=1189909r2=1189910view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Thu Oct 27 18:13:37 2011
@@ -84,7 +84,7 @@ Introduction to the Dependency Mechanism
* {Dependency Scope}
- Dependency scope is used to limit the transitivity of a depedency, and also
to affect the classpath used for
+ Dependency scope is used to limit the transitivity of a dependency, and also
to affect the classpath used for
various build tasks.
There are 6 scopes available:
@@ -415,7 +415,7 @@ Introduction to the Dependency Mechanism
The examples in the previous section describe how to specify managed
dependencies through inheritence. However,
in larger projects it may be impossible to accomplish this since a project
can only inherit from a single parent.
- To accomodate this, projects can import managed dependencies from other
projects. This is accomplished by declaring a
+ To accommodate this, projects can import managed dependencies from other
projects. This is accomplished by declaring a
pom artifact as a dependency with a scope of import.
Project B:
@@ -558,7 +558,7 @@ Introduction to the Dependency Mechanism
++
- In the example above Z imports the managed dependencies from both X and Y.
However, both X and Y contain depedency a. Here,
+ In the example above Z imports the managed dependencies from both X and Y.
However, both X and Y contain dependency a. Here,
version 1.1 of a would be used since X is declared first and a is not
declared in Z's dependencyManagement.
This process is recursive. For example, if X imports another pom, Q, when Z
is processed it will simply appear that all
@@ -739,7 +739,7 @@ Introduction to the Dependency Mechanism
Attempting to do that will result in the build failing since it won't be
able to locate the pom.
* Never declare the pom importing a pom as the parent (or grandparent, etc)
of the target pom.
- There is no way to resolve the cicularity and an exception will be thrown.
+ There is no way to resolve the circularity and an exception will be thrown.
* When referring to artifacts whose poms have transitive dependencies the
project will need to specify versions
of those artifacts as managed dependencies. Not doing so will result in a
build failure since the
svn commit: r1190046 - /maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Author: hboutemy
Date: Thu Oct 27 21:41:24 2011
New Revision: 1190046
URL: http://svn.apache.org/viewvc?rev=1190046view=rev
Log:
[MCHECKSTYLE-62] added aggregate mojo in goals overview
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1190046r1=1190045r2=1190046view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Thu
Oct 27 21:41:24 2011
@@ -43,6 +43,9 @@ Maven Checkstyle Plugin
* {{{./checkstyle-mojo.html}checkstyle:checkstyle}} performs Checkstyle
analysis and generates a report on violations.
+ * {{{./checkstyle-aggregate-mojo.html}checkstyle:checkstyle-aggregate}}
performs Checkstyle analysis and generates a
+ report on violations, aggregating the result in the project which started
this mojo.
+
* {{{./check-mojo.html}checkstyle:check}} performs a violation check
against the last Checkstyle run to see if there are
any violations. It reads the Checkstyle output file, counts the number of
violations found and displays it on the
console.
svn commit: r1190057 - /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Author: hboutemy Date: Thu Oct 27 22:03:33 2011 New Revision: 1190057 URL: http://svn.apache.org/viewvc?rev=1190057view=rev Log: [DOXIASITETOOLS-51] improved custom field description with information on how to use its content in a Velocity template Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=1190057r1=1190056r2=1190057view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Thu Oct 27 22:03:33 2011 @@ -31,12 +31,14 @@ under the License. lia href=http://maven.apache.org/xsd/decoration-1.0.0.xsd;http://maven.apache.org/xsd/decoration-1.0.0.xsd/a for Maven 2.0./li /ul ]]/description + defaults default keypackage/key valueorg.apache.maven.doxia.site.decoration/value /default /defaults + classes class rootElement=true xml.tagName=project java.clone=deep nameDecorationModel/name @@ -126,7 +128,11 @@ under the License. /field field xdoc.separator=blank namecustom/name - descriptionCustom configuration for use with customized Velocity templates./description + description![CDATA[ +Custom configuration for use with customized Velocity templates. Data from this field are +accessible in Velocity template from code$decoration.custom/code variable as DOM content. +Example: code$decoration.custom.getChild( 'customElement' ).getValue()/code + ]]/description version1.0.0+/version typeDOM/type identifiertrue/identifier @@ -208,6 +214,7 @@ under the License. /codeSegment /codeSegments /class + class java.clone=deep nameBanner/name descriptionBanner logo on the masthead of the site./description @@ -265,6 +272,7 @@ under the License. /field /fields /class + class java.clone=deep namePublishDate/name descriptionModify display properties for date published./description @@ -287,6 +295,7 @@ under the License. /field /fields /class + class java.clone=deep nameVersion/name descriptionModify display properties for version published./description @@ -301,12 +310,14 @@ under the License. /field /fields /class + class java.clone=deep nameLogo/name descriptionPower by logo on the navigation./description version1.0.0+/version superClassLinkItem/superClass /class + class java.clone=deep xsd.compositor=sequence nameBody/name descriptionThe main content decoration./description @@ -358,6 +369,7 @@ under the License. /field /fields /class + class java.clone=deep nameLinkItem/name descriptionA link in the navigation./description @@ -429,6 +441,7 @@ under the License. /field /fields /class + class java.clone=deep xsd.compositor=sequence nameMenu/name descriptionA menu in the navigation./description @@ -524,6 +537,7 @@ under the License. /field /fields /class + class java.clone=deep xsd.compositor=sequence nameMenuItem/name descriptionA menu item./description @@ -564,6 +578,7 @@ under the License. /field /fields /class + class java.clone=deep nameSkin/name descriptionAn skin artifact declaration./description
svn commit: r1190061 - in /maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample: pom.xml src/site/apt/index.apt.vm
Author: hboutemy
Date: Thu Oct 27 22:11:41 2011
New Revision: 1190061
URL: http://svn.apache.org/viewvc?rev=1190061view=rev
Log:
use pom's description as a property
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/pom.xml
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/pom.xml?rev=1190061r1=1190060r2=1190061view=diff
==
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/pom.xml (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/pom.xml Thu Oct 27
22:11:41 2011
@@ -34,6 +34,7 @@
properties
skinName@project.name@/skinName
+skinDescription@project.description@/skinDescription
skinGroupId@project.groupId@/skinGroupId
skinArtifactId@project.artifactId@/skinArtifactId
skinVersion@project.version@/skinVersion
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1190061r1=1190060r2=1190061view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Thu Oct 27 22:11:41 2011
@@ -9,7 +9,7 @@
${skinName} test
This is a test for ${skinName}.
- ${skinName} is an Apache Maven site skin built on top of Twitter's bootstrap.
+ ${skinDescription}
* Usage
svn commit: r1190062 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Author: hboutemy
Date: Thu Oct 27 22:14:05 2011
New Revision: 1190062
URL: http://svn.apache.org/viewvc?rev=1190062view=rev
Log:
improved custom snippet
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm?rev=1190062r1=1190061r2=1190062view=diff
==
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/it/sample/src/site/apt/index.apt.vm
Thu Oct 27 22:14:05 2011
@@ -29,15 +29,19 @@ ${skinName} test
+-+
The skin supports different layouts, enabling/disabling the left sidebar menu
and the topbar menu.
- Users have just play with flags in the custom/fluidoSkin element in
site.xml.
+ Users have just play with flags in the custom/fluidoSkin element in
site.xml:
+-+
-custom
- fluidoSkin
-topBarEnabledtrue/topBarEnabled
-sideBarEnabledfalse/sideBarEnabled
- /fluidoSkin
-/custom
+project name=xxx
+ ...
+ custom
+fluidoSkin
+ topBarEnabledtrue/topBarEnabled
+ sideBarEnabledfalse/sideBarEnabled
+/fluidoSkin
+ /custom
+ ...
+/project
+-+
That allows users having 4 skins in only 1!
svn commit: r1190063 - /maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
Author: hboutemy
Date: Thu Oct 27 22:14:53 2011
New Revision: 1190063
URL: http://svn.apache.org/viewvc?rev=1190063view=rev
Log:
copied the custom fluidoSkin documentation from IT to main documentation
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1190063r1=1190062r2=1190063view=diff
==
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm
(original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/site/apt/index.apt.vm Thu
Oct 27 22:14:53 2011
@@ -48,3 +48,32 @@ ${project.name}
...
/project
+-+
+
+ The skin supports different layouts, enabling/disabling the left sidebar menu
and the topbar menu.
+ Users have just play with flags in the custom/fluidoSkin element in
site.xml:
+
++-+
+project name=xxx
+ ...
+ custom
+fluidoSkin
+ topBarEnabledtrue/topBarEnabled
+ sideBarEnabledfalse/sideBarEnabled
+/fluidoSkin
+ /custom
+ ...
+/project
++-+
+
+ That allows users having 4 skins in only 1!
+
+ [[1]] sidebar only;
+
+ [[2]] topbar only;
+
+ [[3]] both side/top bars;
+
+ [[4]] none at all.
+
+ Default skin setting is the option 1.
+
svn commit: r1190069 - /maven/maven-3/trunk/pom.xml
Author: hboutemy Date: Thu Oct 27 22:23:24 2011 New Revision: 1190069 URL: http://svn.apache.org/viewvc?rev=1190069view=rev Log: fixed typo Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1190069r1=1190068r2=1190069view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Thu Oct 27 22:23:24 2011 @@ -1,13 +1,18 @@ ?xml version=1.0 encoding=UTF-8? !-- -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. +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. -- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; @@ -52,7 +57,7 @@ jxpathVersion1.3/jxpathVersion aetherVersion1.11/aetherVersion maven.test.redirectTestOutputToFiletrue/maven.test.redirectTestOutputToFile -!-- Control the name of the distribtion and information output by mvn -- +!-- Control the name of the distribution and information output by mvn -- distributionIdapache-maven/distributionId distributionShortNameMaven/distributionShortName distributionNameApache Maven/distributionName
svn commit: r1190074 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
Author: hboutemy
Date: Thu Oct 27 23:05:42 2011
New Revision: 1190074
URL: http://svn.apache.org/viewvc?rev=1190074view=rev
Log:
[DOXIASITETOOLS-51] added the list of variable defined in Velocity context
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt?rev=1190074r1=1190073r2=1190074view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt
Thu Oct 27 23:05:42 2011
@@ -44,3 +44,54 @@ Doxia Site Tools - Site Renderer
{{{http://docs.codehaus.org/display/MAVENUSER/Maven+Skins}more skins are
listed in MAVENUSER wiki}}.
Some documentation is available on
{{{/plugins/maven-site-plugin/examples/creatingskins.html}how to write a new
skin}}.
+
+* Velocity processing
+
+ When their file names end in .vm, documents are processed by Velocity.
+
+ The velocity context defines some variables:
+
+*-++---+
+|| variable || type || description
||
+*-++---+
+| relativePath | String |
|
+*-++---+
+| authors | List\String\ |
|
+*-++---+
+| title | String |
|
+*-++---+
+| headContent | String |
|
+*-++---+
+| bodyContent | String |
|
+*-++---+
+| decoration|
{{{../doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html}DecorationModel}}
||
+*-++---+
+| dateCreation | String |
|
+*-++---+
+| dateRevision | String |
|
+*-++---+
+| currentDate | Date |
|
+*-++---+
+| dateFormat| DateFormat |
|
+*-++---+
+| currentFileName | String |
|
+*-++---+
+| alignedFileName | String |
|
+*-++---+
+| locale| Locale |
|
+*-++---+
+| supportedLocales | List\Locale\ |
|
+*-++---+
+| template properties ||
|
+*-++---+
+| PathTool | PathTool |
|
+*-++---+
+| FileUtils | FileUtils|
|
+*-++---+
+| StringUtils | StringUtils |
|
+*-++---+
+| i18n | i18n |
|
+*-++---+
+
+ see
{{{./xref/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.html#426}DefaultSiteRenderer.createContext(...)}}
+ source for more
