March 2012 - Maven-nuiton-skin-commits - mailman.cloud.codelutin.com

r666 - trunk
by maven-release＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: maven-release Date: 2012-03-22 10:24:45 +0100 (Thu, 22 Mar 2012) New Revision: 666 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/666 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 09:24:44 UTC (rev 665) +++ trunk/pom.xml 2012-03-22 09:24:45 UTC (rev 666) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> <name>Maven Nuiton Skin</name> @@ -132,12 +132,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-… + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-… + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> <distributionManagement>

1 0

r665 - in tags: . maven-nuiton-skin-1.1.2
by maven-release＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: maven-release Date: 2012-03-22 10:24:44 +0100 (Thu, 22 Mar 2012) New Revision: 665 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/665 Log: [maven-release-plugin] copy for tag maven-nuiton-skin-1.1.2 Added: tags/maven-nuiton-skin-1.1.2/ Property changes on: tags/maven-nuiton-skin-1.1.2 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin *.iml Added: svn:mergeinfo +

1 0

r664 - trunk
by maven-release＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: maven-release Date: 2012-03-22 10:24:42 +0100 (Thu, 22 Mar 2012) New Revision: 664 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/664 Log: [maven-release-plugin] prepare release maven-nuiton-skin-1.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 09:14:39 UTC (rev 663) +++ trunk/pom.xml 2012-03-22 09:24:42 UTC (rev 664) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> <name>Maven Nuiton Skin</name> @@ -132,12 +132,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-… </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-… </developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> </scm> <distributionManagement>

1 0

r663 - trunk/src/main/java/org/nuiton/maven/skin
by tchemit＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 10:14:39 +0100 (Thu, 22 Mar 2012) New Revision: 663 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/663 Log: fixes #2025 Updates to commons-lang3 @0h15m (time tracking test :)) Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-22 09:13:43 UTC (rev 662) +++ trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-22 09:14:39 UTC (rev 663) @@ -236,7 +236,7 @@ if (piwikEnabled) { - // add pwiki variables + // add pwiki variables context.put("piwikEnabled", true); context.put("piwikSiteId", piwikSiteId); }

1 0

r662 - trunk/src/main/java/org/nuiton/maven/skin
by tchemit＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 10:13:43 +0100 (Thu, 22 Mar 2012) New Revision: 662 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/662 Log: fixes Evolution #2025 Updates to commons-lang3 @0h15m (time tracking test :)) Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-22 09:02:05 UTC (rev 661) +++ trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-22 09:13:43 UTC (rev 662) @@ -235,6 +235,8 @@ } if (piwikEnabled) { + + // add pwiki variables context.put("piwikEnabled", true); context.put("piwikSiteId", piwikSiteId); }

1 0

r661 - in trunk: . src/main/java/org/nuiton/maven/skin
by tchemit＠users.nuiton.org 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 10:02:05 +0100 (Thu, 22 Mar 2012) New Revision: 661 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/661 Log: Evolution #2025 Updates to commons-lang3 @0h15m Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-21 00:48:18 UTC (rev 660) +++ trunk/pom.xml 2012-03-22 09:02:05 UTC (rev 661) @@ -81,8 +81,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-21 00:48:18 UTC (rev 660) +++ trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-22 09:02:05 UTC (rev 661) @@ -24,7 +24,7 @@ */ package org.nuiton.maven.skin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer; import org.apache.maven.doxia.siterenderer.DocumentRenderer; import org.apache.maven.doxia.siterenderer.RendererException;

1 0

r660 - in trunk: . src/main/java/org/nuiton/maven/skin
by tchemit＠users.nuiton.org 21 Mar '12

21 Mar '12

Author: tchemit Date: 2012-03-21 01:48:18 +0100 (Wed, 21 Mar 2012) New Revision: 660 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/660 Log: closes #2022 : Updates some libs + reformat code Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-21 00:31:34 UTC (rev 659) +++ trunk/pom.xml 2012-03-21 00:48:18 UTC (rev 660) @@ -94,7 +94,7 @@ <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-inject-plexus</artifactId> - <version>1.4.2</version> + <version>2.3.0</version> </dependency> <dependency> @@ -123,7 +123,7 @@ <doxiaVersion>1.2</doxiaVersion> <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion> - <mavenVersion>3.0</mavenVersion> + <mavenVersion>3.0.4</mavenVersion> <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-21 00:31:34 UTC (rev 659) +++ trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-21 00:48:18 UTC (rev 660) @@ -204,7 +204,8 @@ throws RendererException { if (getLogger().isDebugEnabled()) { - getLogger().debug("Will generate document " + sink.getRenderingContext().getOutputName()); + getLogger().debug("Will generate document " + + sink.getRenderingContext().getOutputName()); } Context context = createContext(sink, siteRenderingContext);

1 0

r659 - in trunk/src: main/java/org/nuiton/maven/skin main/resources/META-INF/maven site/apt site/en/apt
by tchemit＠users.nuiton.org 21 Mar '12

21 Mar '12

Author: tchemit Date: 2012-03-21 01:31:34 +0100 (Wed, 21 Mar 2012) New Revision: 659 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/659 Log: closes #2017 : Replace google Analytics by Piwik Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java trunk/src/main/resources/META-INF/maven/site.vm trunk/src/site/apt/index.apt.vm trunk/src/site/en/apt/index.apt.vm Modified: trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java =================================================================== --- trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-20 23:47:16 UTC (rev 658) +++ trunk/src/main/java/org/nuiton/maven/skin/NuitonSiteRenderer.java 2012-03-21 00:31:34 UTC (rev 659) @@ -81,6 +81,10 @@ private boolean scmwebeditorEnabled; + private boolean piwikEnabled; + + private String piwikSiteId; + protected Method getWriteTemplateMethod() { if (writeTemplateMethod == null) { writeTemplateMethod = ReflectUtil.getMethod( @@ -116,14 +120,18 @@ // prepare all common values for a given module - locale = siteRenderingContext.getLocale(); Map<String, ?> templateProperties = siteRenderingContext.getTemplateProperties(); - String value = (String) templateProperties.get("scmwebeditorEnabled"); - scmwebeditorEnabled = StringUtils.isNotEmpty(value) && !"false".equals(value); + scmwebeditorEnabled = getBooleanProperty( + (String) templateProperties.get("scmwebeditorEnabled")); + mavenProject = (MavenProject) templateProperties.get("project"); + + piwikEnabled = getBooleanProperty( + (String) mavenProject.getProperties().get("piwikEnabled")); + if (scmwebeditorEnabled) { // get locales (defined in pom) @@ -134,8 +142,8 @@ this.locales = locales; - mavenProject = (MavenProject) templateProperties.get("project"); - siteSourcesType = (String) mavenProject.getProperties().get("siteSourcesType"); + siteSourcesType = (String) + mavenProject.getProperties().get("siteSourcesType"); String scm = mavenProject.getScm().getDeveloperConnection(); String scmURL = scm.substring(8); @@ -151,10 +159,42 @@ siteXmlScmwebeditorURL = scmwebeditorPrefixURL + editFile; getLogger().debug("[" + editFile + "] scmwebeditor url = " + siteXmlScmwebeditorURL); + } + if (piwikEnabled) { + + String piwikId = (String) mavenProject.getProperties().get("piwikId"); + if (StringUtils.isEmpty(piwikId)) { + + // try to use piwikId from platform + String platform = (String) mavenProject.getProperties().get("platform"); + + if ("nuiton.org".equals(platform)) { + piwikSiteId = "2"; + } else if ("chorem.org".equals(platform)) { + piwikSiteId = "3"; + } else if ("forge.codelutin.com".equals(platform)) { + piwikSiteId = "4"; + } else { + getLogger().warn( + "No piwik id known for this platform " + + platform + + ", please fill yourself a piwikId in your pom"); + + // disable piwik + piwikEnabled = false; + } + } else { + + // use given id + piwikSiteId = piwikId; + } } + if (piwikEnabled) { + getLogger().info("piwik is enabled, will use piwikiId : " + + piwikSiteId); + } super.render(documents, siteRenderingContext, outputDirectory); - } @Override @@ -180,7 +220,7 @@ if (scmwebeditorEnabled) { // add our tool to velocity context - + ScmwebeditorUtils tool = new ScmwebeditorUtils(context, getLogger()); tool.setLocale(locale); @@ -191,7 +231,11 @@ tool.setSiteXmlScmwebeditorURL(siteXmlScmwebeditorURL); tool.buildStates(); context.put("ScmwebeditorUtils", tool); + } + if (piwikEnabled) { + context.put("piwikEnabled", true); + context.put("piwikSiteId", piwikSiteId); } return context; } @@ -205,4 +249,9 @@ ReflectUtil.invokeMethod(m, this, writer, context, siteContext); } + protected boolean getBooleanProperty(String value) { + boolean result = StringUtils.isNotEmpty(value) && !"false".equals(value); + return result; + } + } \ No newline at end of file Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2012-03-20 23:47:16 UTC (rev 658) +++ trunk/src/main/resources/META-INF/maven/site.vm 2012-03-21 00:31:34 UTC (rev 659) @@ -351,6 +351,20 @@ #end #end #end + #if ( "$piwikEnabled" != "false" ) + +<script type="text/javascript"> + var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.codelutin.com/" : "http://piwik.codelutin.com/"); + document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); +</script><script type="text/javascript"> +try { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $piwikSiteId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://piwik.codelutin.com/piwik.php?idsite=$piwikSiteId" style="border:0" alt="" /></p></noscript> + + #end </head> <body class="composite"> <div id="banner"> @@ -448,22 +462,6 @@ </script> </div> #end - #if ( "$googleAnalyticsEnabled" != "false" ) - <script src="http://www.google-analytics.com/urchin.js" - type="text/javascript"> - </script> - <script type="text/javascript"> -  - </script> - <div id="googleAnalytics"> - <a class="tiny" href="http://www.codelutin.com/google">google - analytics</a> - </div> - #end </div> <div id="bodyColumn"> Modified: trunk/src/site/apt/index.apt.vm =================================================================== --- trunk/src/site/apt/index.apt.vm 2012-03-20 23:47:16 UTC (rev 658) +++ trunk/src/site/apt/index.apt.vm 2012-03-21 00:31:34 UTC (rev 659) @@ -64,4 +64,6 @@ * <googleAdSenseEnabled> : mettre n'importe quoi sauf <<false>> pour que afficher des google-Ads dans la colonne de gauche. - * <googleAnalyticsEnabled> : mettre n'importe quoi sauf <<false>> pour que le site soit analysé par google analytics. \ No newline at end of file + * <piwikEnabled> : mettre n'importe quoi sauf <<false>> pour que le site soit analysé par Piwik*. + + * <piwikId> : pour spécifier un id de site Piwik (sinon celui de la forge qui héberge sera utilisé). \ No newline at end of file Modified: trunk/src/site/en/apt/index.apt.vm =================================================================== --- trunk/src/site/en/apt/index.apt.vm 2012-03-20 23:47:16 UTC (rev 658) +++ trunk/src/site/en/apt/index.apt.vm 2012-03-21 00:31:34 UTC (rev 659) @@ -64,4 +64,6 @@ * <googleAdSenseEnabled> : Set anything else to <<false>> to display google ads in the left column. - * <googleAnalyticsEnabled> : Set anything else to <<false>> to make site analyze by google analytics. \ No newline at end of file + * <piwikEnabled> : Set anything else to <<false>> to make site analyze by Piwik. + + * <piwikId> : To specify a Piwik site id (otherwise the owning forge piwik site id will be used). \ No newline at end of file

1 0

r658 - trunk
by tchemit＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: tchemit Date: 2012-03-21 00:47:16 +0100 (Wed, 21 Mar 2012) New Revision: 658 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/658 Log: closes #2020 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-29 12:54:40 UTC (rev 657) +++ trunk/pom.xml 2012-03-20 23:47:16 UTC (rev 658) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>maven-nuiton-skin</artifactId> @@ -131,8 +131,12 @@ </properties> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> + <connection> + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk + </connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm>

1 0