November 2009 - Maven-nuiton-skin-commits - mailman.cloud.codelutin.com

r566 - in trunk: . src/main/resources/META-INF/maven
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

Author: tchemit Date: 2009-11-24 23:54:54 +0100 (Tue, 24 Nov 2009) New Revision: 566 Modified: trunk/pom.xml trunk/src/main/resources/META-INF/maven/site.vm Log: - add Geoffroy as developer - use now a defaultLocale parameter in template to be able to use classic maven site directory layout - use now a scmwebeditorUrl parameter in template to be able to change it :) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 15:30:16 UTC (rev 565) +++ trunk/pom.xml 2009-11-24 22:54:54 UTC (rev 566) @@ -64,6 +64,18 @@ </roles> </developer> + <developer> + <name>Geoffroy Lorieux</name> + <id>glorieux</id> + <email>glorieux(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> <packaging>jar</packaging> Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2009-11-24 15:30:16 UTC (rev 565) +++ trunk/src/main/resources/META-INF/maven/site.vm 2009-11-24 22:54:54 UTC (rev 566) @@ -51,7 +51,7 @@ | #end #end - | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> + | <a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=$alignedFileName&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$project.properties.defaultLocale&format=$project.properties.siteSourcesType" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> #end #macro ( breadcrumbs $breadcrumbs )

1 0

r565 - trunk/src/main/resources
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

Author: tchemit Date: 2009-11-24 16:30:16 +0100 (Tue, 24 Nov 2009) New Revision: 565 Removed: trunk/src/main/resources/maven-lutin-skin.properties trunk/src/main/resources/maven-lutin-skin_en.properties trunk/src/main/resources/maven-lutin-skin_fr.properties Log: remove old lutin bundle Deleted: trunk/src/main/resources/maven-lutin-skin.properties =================================================================== --- trunk/src/main/resources/maven-lutin-skin.properties 2009-11-24 15:28:22 UTC (rev 564) +++ trunk/src/main/resources/maven-lutin-skin.properties 2009-11-24 15:30:16 UTC (rev 565) @@ -1,2 +0,0 @@ -whymakedonate=Why make a donate -whymakedonate.url=http://www.codelutin.com/whymakedonate/en Deleted: trunk/src/main/resources/maven-lutin-skin_en.properties =================================================================== --- trunk/src/main/resources/maven-lutin-skin_en.properties 2009-11-24 15:28:22 UTC (rev 564) +++ trunk/src/main/resources/maven-lutin-skin_en.properties 2009-11-24 15:30:16 UTC (rev 565) @@ -1,2 +0,0 @@ -whymakedonate=Why make a donate -whymakedonate.url=http://www.codelutin.com/whymakedonate/en Deleted: trunk/src/main/resources/maven-lutin-skin_fr.properties =================================================================== --- trunk/src/main/resources/maven-lutin-skin_fr.properties 2009-11-24 15:28:22 UTC (rev 564) +++ trunk/src/main/resources/maven-lutin-skin_fr.properties 2009-11-24 15:30:16 UTC (rev 565) @@ -1,2 +0,0 @@ -whymakedonate=Pourquoi faire un don -whymakedonate.url=http://www.codelutin.com/whymakedonate/fr

1 0

r564 - trunk/src/main/resources/META-INF/maven
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

Author: tchemit Date: 2009-11-24 16:28:22 +0100 (Tue, 24 Nov 2009) New Revision: 564 Modified: trunk/src/main/resources/META-INF/maven/site.vm Log: prefer use a siteSourcesType property instead of sourcesType Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2009-11-12 00:07:53 UTC (rev 563) +++ trunk/src/main/resources/META-INF/maven/site.vm 2009-11-24 15:28:22 UTC (rev 564) @@ -51,7 +51,7 @@ | #end #end - | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> + | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> #end #macro ( breadcrumbs $breadcrumbs )

1 0

r563 - in trunk: . src/main/resources src/main/resources/META-INF/maven src/site src/site/fr
by tchemit＠users.nuiton.org 12 Nov '09

12 Nov '09

Author: tchemit Date: 2009-11-12 01:07:53 +0100 (Thu, 12 Nov 2009) New Revision: 563 Added: trunk/src/site/fr/ trunk/src/site/fr/apt/ trunk/src/site/site_fr.xml Removed: trunk/src/site/apt/ trunk/src/site/site.xml Modified: trunk/pom.xml trunk/src/main/resources/META-INF/maven/site.vm trunk/src/main/resources/maven-nuiton-skin.properties trunk/src/main/resources/maven-nuiton-skin_en.properties trunk/src/main/resources/maven-nuiton-skin_fr.properties trunk/src/site/site_en.xml Log: - use symetric directory layout for site - fix url in scmwebeditor - can reuse now bundles in maven.vm (to be finished) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/pom.xml 2009-11-12 00:07:53 UTC (rev 563) @@ -28,6 +28,43 @@ <distribution>local</distribution> </license> </licenses> + + <developers> + + <developer> + <name>Julien Ruchaud</name> + <id>jruchaud</id> + <email>ruchaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + </developers> <packaging>jar</packaging> @@ -57,12 +94,13 @@ <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> + <version>2.0.1-cl_20091107</version> <configuration> <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>fr,en</locales> + <symetricLayout>true</symetricLayout> </configuration> </plugin> @@ -81,6 +119,24 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> </plugins> </reporting> Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/main/resources/META-INF/maven/site.vm 2009-11-12 00:07:53 UTC (rev 563) @@ -51,7 +51,7 @@ | #end #end - | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">Edit this page</a> + | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> #end #macro ( breadcrumbs $breadcrumbs ) Modified: trunk/src/main/resources/maven-nuiton-skin.properties =================================================================== --- trunk/src/main/resources/maven-nuiton-skin.properties 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/main/resources/maven-nuiton-skin.properties 2009-11-12 00:07:53 UTC (rev 563) @@ -1,2 +1,3 @@ whymakedonate=Why make a donate whymakedonate.url=http://www.codelutin.com/whymakedonate/en +edit.scm.page=Edit page \ No newline at end of file Modified: trunk/src/main/resources/maven-nuiton-skin_en.properties =================================================================== --- trunk/src/main/resources/maven-nuiton-skin_en.properties 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/main/resources/maven-nuiton-skin_en.properties 2009-11-12 00:07:53 UTC (rev 563) @@ -1,2 +1,3 @@ whymakedonate=Why make a donate whymakedonate.url=http://www.codelutin.com/whymakedonate/en +edit.scm.page=Edit page \ No newline at end of file Modified: trunk/src/main/resources/maven-nuiton-skin_fr.properties =================================================================== --- trunk/src/main/resources/maven-nuiton-skin_fr.properties 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/main/resources/maven-nuiton-skin_fr.properties 2009-11-12 00:07:53 UTC (rev 563) @@ -1,2 +1,3 @@ whymakedonate=Pourquoi faire un don whymakedonate.url=http://www.codelutin.com/whymakedonate/fr +edit.scm.page=Editer la page \ No newline at end of file Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/site/site.xml 2009-11-12 00:07:53 UTC (rev 563) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - - <bannerLeft> - <name>${project.name}</name> - <src>${project.url}</src> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> -  - </poweredBy> - - <body> - <links> - <item name="Chorem" href="http://www.chorem.org"/> - <item name="Nuiton" href="http://www.nuiton.org"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="dépôt maven" href="${repository.home.url}"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="index.html"/> - <item name="en]" href="en/index.html"/> - </links> - - <breadcrumbs> - <item name="Nuiton" href="http://www.nuiton.org" /> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-11-11 19:30:56 UTC (rev 562) +++ trunk/src/site/site_en.xml 2009-11-12 00:07:53 UTC (rev 563) @@ -31,13 +31,13 @@ <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="dépôt maven" href="${repository.home.url}"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="index.html"/> - <item name="en]" href="en/index.html"/> + <item name="[fr" href="../fr/index.html"/> + <item name="en]" href="index.html"/> </links> <breadcrumbs> <item name="Nuiton" href="http://www.nuiton.org" /> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="index.html" /> </breadcrumbs> <menu name="User"> Copied: trunk/src/site/site_fr.xml (from rev 561, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2009-11-12 00:07:53 UTC (rev 563) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>1.0.0</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + <src>${project.url}</src> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> +  + </poweredBy> + + <body> + <links> + <item name="Chorem" href="http://www.chorem.org"/> + <item name="Nuiton" href="http://www.nuiton.org"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="dépôt maven" href="${repository.home.url}"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + <item name="[fr" href="${project.url}/index.html"/> + <item name="en]" href="../en/index.html"/> + </links> + + <breadcrumbs> + <item name="Nuiton" href="http://www.nuiton.org" /> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r562 - trunk/src/main/resources/META-INF/maven
by glorieux＠users.nuiton.org 11 Nov '09

11 Nov '09

Author: glorieux Date: 2009-11-11 20:30:56 +0100 (Wed, 11 Nov 2009) New Revision: 562 Modified: trunk/src/main/resources/META-INF/maven/site.vm Log: Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2009-11-02 07:24:30 UTC (rev 561) +++ trunk/src/main/resources/META-INF/maven/site.vm 2009-11-11 19:30:56 UTC (rev 562) @@ -42,15 +42,16 @@ #macro ( links $links ) #set ( $counter = 0 ) - #foreach( $item in $links ) + #foreach( $item in $links ) #set ( $counter = $counter + 1 ) #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) ) #link( $currentItemHref $item.name ) #if ( $links.size() > $counter ) | - #end - #end + #end + #end + | <a href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor?adresse=$pr…" class="externalLink">Edit this page</a> #end #macro ( breadcrumbs $breadcrumbs ) @@ -360,29 +361,25 @@  <div id="Google-search"> - <form method="get" action="http://www.google.fr/custom" target="_top"> - <input type="hidden" name="client" value="pub-5067547915349883"></input> - <input type="hidden" name="forid" value="1"></input> - <input type="hidden" name="ie" value="ISO-8859-15"></input> - <input type="hidden" name="oe" value="ISO-8859-15"></input> - <input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;A… - <input type="hidden" name="hl" value="fr"></input> - <table bgcolor="#eeeeee"> - <tr> - <td valign="top" align="right"> - <label for="sbi" style="display: none">Entrez les termes que vous recherchez.</label> - <input type="text" name="q" size="10" maxlength="255" value="" id="sbi"></input> - <label for="sbb" style="display: none">Envoyer un formulaire de recherche</label> - </td> - </tr> - <tr> - <td valign="top" align="right"> - <input type="submit" name="sa" value="Google" id="sbb"></input> - </td> - </tr> - </table> - </form> - </div> + <form action="http://www.google.com/cse" id="cse-search-box"> + <div> + #if( $project.groupId == "org.nuiton" ) + <input type="hidden" name="cx" value="006400969094406405403:svbxely-vkg" /> + #elseif( $project.groupId == "org.chorem" ) + <input type="hidden" name="cx" value="006400969094406405403:qk_jy5z6gaw" /> + #end + <input type="hidden" name="ie" value="UTF-8" /> + <input type="text" name="q" size="17" /> + #if( $locale == "fr" ) + <input type="submit" name="sa" value="Rechercher" /> + #elseif( $locale == "en" ) + <input type="submit" name="sa" value="Search" /> + #end + <input type="hidden" name="as_sitesearch" value="$project.url*"/> + </div> + </form> + <script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&lang=fr"></script> + </div>

1 0

r561 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 08:24:30 +0100 (Mon, 02 Nov 2009) New Revision: 561 Modified: trunk/ trunk/pom.xml Log: use maven-resources-plugin 2.4.1 Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin + .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin *.iml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-09 12:20:05 UTC (rev 560) +++ trunk/pom.xml 2009-11-02 07:24:30 UTC (rev 561) @@ -49,7 +49,7 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> + <version>2.4.1</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration>

1 0