michael-o commented on code in PR #22:
URL: https://github.com/apache/maven-fluido-skin/pull/22#discussion_r853812905
##########
pom.xml:
##########
@@ -101,6 +101,7 @@ under the License.
<bootstrap.version>2.3.2</bootstrap.version>
<jquery.version>1.11.2</jquery.version>
<sitePluginVersion>3.8.2</sitePluginVersion>
+ <doxiaSitetoolsVersion>1.11.2-SNAPSHOT</doxiaSitetoolsVersion>
Review Comment:
Not required anymore.
##########
pom.xml:
##########
@@ -260,6 +261,7 @@ under the License.
<goals>
<goal>site</goal>
</goals>
+ <streamLogsOnFailures>true</streamLogsOnFailures>
Review Comment:
What does this change in this case?
##########
pom.xml:
##########
@@ -38,8 +38,8 @@ under the License.
<inceptionYear>2011</inceptionYear>
<scm>
-
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-fluido-skin.git</connection>
-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-fluido-skin.git</developerConnection>
+
<connection>scm:git:https://github.com/apache/maven-fluido-skin.git</connection>
+
<developerConnection>scm:git:https://github.com/apache/maven-fluido-skin.git</developerConnection>
Review Comment:
The repos on ASF infra. Please drop this, it is unrelated to the issue.
##########
src/site/apt/index.apt.vm:
##########
@@ -166,6 +166,29 @@ Welcome to ${project.name}!
</project>
+-----+
+** Matomo (i.e ApacheAnalytics)
Review Comment:
e.g.,
##########
src/site/apt/index.apt.vm:
##########
@@ -166,6 +166,29 @@ Welcome to ${project.name}!
</project>
+-----+
+** Matomo (i.e ApacheAnalytics)
+
+ Users can optionally enable <<Matomo>>.
+ How to configure it for Apache Analytics:
Review Comment:
This sample doesn't actually show how to configure for Apache Analytics,
values aren't filled.
##########
src/it/mskins-177-apache-analytics/src/site/site.xml:
##########
@@ -0,0 +1,54 @@
+<?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.
+ */
+ -->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0
http://maven.apache.org/xsd/decoration-1.1.0.xsd";
+ name="${skinName}">
+
+ <skin>
+ <groupId>${skinGroupId}</groupId>
+ <artifactId>${skinArtifactId}</artifactId>
+ <version>${skinVersion}</version>
+ </skin>
+
+ <!-- START SNIPPET: skin-apache-analytics -->
+ <custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>analytics.apache.org</url>
Review Comment:
Thats not a url, but rather a hostname. You should provide a full URL for
maximun flexiblity.
##########
src/main/resources/META-INF/maven/site.vm:
##########
@@ -52,6 +52,11 @@
#**##end
#**##if( $headContent )$headContent#end
#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
+#**##if ( $decoration.getCustomValue( 'matomo.url' ) &&
$decoration.getCustomValue( 'matomo.url' ) != ''
+ && $decoration.getCustomValue( 'matomo.siteId' ) &&
$decoration.getCustomValue( 'matomo.siteId' ) != ''
+ )
+#* *##matomo( $decoration.custom.getChild('matomo') )
Review Comment:
This test should be pushed into the macro, just like here:
https://github.com/apache/maven-fluido-skin/blob/0cef65c2abd91af3297b2e7ec95790e7b4bfabb0/src/main/resources/META-INF/maven/site-macros.vm#L548-L570
##########
src/it/mskins-177-apache-analytics/src/site/site.xml:
##########
@@ -0,0 +1,54 @@
+<?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.
+ */
+ -->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0
http://maven.apache.org/xsd/decoration-1.1.0.xsd";
+ name="${skinName}">
+
+ <skin>
+ <groupId>${skinGroupId}</groupId>
+ <artifactId>${skinArtifactId}</artifactId>
+ <version>${skinVersion}</version>
+ </skin>
+
+ <!-- START SNIPPET: skin-apache-analytics -->
+ <custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>analytics.apache.org</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ <foo>Bar</foo>
+ </options>
+ </matomo>
Review Comment:
I like this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
