This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSKINS-201
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit f727e54c953c6ee9fc4af7de9d2597efc7bc3b20
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Jan 1 03:44:46 2023 +0100
[MSKINS-201] Replace deprecated
DecorationModel#getGoogleAnalyticsAccountId() with custom value
This closes #42
---
src/it/mskins-143_default/src/site/site.xml | 10 +++++++---
src/it/mskins-143_false/src/site/site.xml | 3 +--
src/it/mskins-143_true/src/site/site.xml | 3 +--
src/it/mskins-177-apache-analytics/src/site/site.xml | 3 ---
src/it/mskins-177-matomo-no-options/src/site/site.xml | 3 ---
src/main/resources/META-INF/maven/site-macros.vm | 3 ++-
src/main/resources/META-INF/maven/site.vm | 2 +-
src/site/apt/index.apt.vm | 11 ++++++++---
8 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/it/mskins-143_default/src/site/site.xml
b/src/it/mskins-143_default/src/site/site.xml
index 62d9e6d..71c92cc 100644
--- a/src/it/mskins-143_default/src/site/site.xml
+++ b/src/it/mskins-143_default/src/site/site.xml
@@ -39,9 +39,13 @@
</body>
<!-- START SNIPPET: skin-custom-config -->
- <!-- no custom config -->
+ <custom>
+ <fluidoSkin>
+ <googleAnalytics>
+ <accountId>FOO-BAR</accountId>
+ </googleAnalytics>
+ </fluidoSkin>
+ </custom>
<!-- END SNIPPET: skin-custom-config -->
- <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
-
</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_false/src/site/site.xml
b/src/it/mskins-143_false/src/site/site.xml
index 36d6b74..e4f518e 100644
--- a/src/it/mskins-143_false/src/site/site.xml
+++ b/src/it/mskins-143_false/src/site/site.xml
@@ -35,6 +35,7 @@
<custom>
<fluidoSkin>
<googleAnalytics>
+ <accountId>FOO-BAR</accountId>
<anonymizeIp>false</anonymizeIp>
<forceSSL>false</forceSSL>
</googleAnalytics>
@@ -49,6 +50,4 @@
</breadcrumbs>
</body>
- <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
-
</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_true/src/site/site.xml
b/src/it/mskins-143_true/src/site/site.xml
index 5bef0f6..e7054dc 100644
--- a/src/it/mskins-143_true/src/site/site.xml
+++ b/src/it/mskins-143_true/src/site/site.xml
@@ -35,6 +35,7 @@
<custom>
<fluidoSkin>
<googleAnalytics>
+ <accountId>FOO-BAR</accountId>
<anonymizeIp>true</anonymizeIp>
<forceSSL>true</forceSSL>
</googleAnalytics>
@@ -49,6 +50,4 @@
</breadcrumbs>
</body>
- <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
-
</project>
\ No newline at end of file
diff --git a/src/it/mskins-177-apache-analytics/src/site/site.xml
b/src/it/mskins-177-apache-analytics/src/site/site.xml
index fcc43fb..e7269aa 100644
--- a/src/it/mskins-177-apache-analytics/src/site/site.xml
+++ b/src/it/mskins-177-apache-analytics/src/site/site.xml
@@ -54,7 +54,4 @@
<head/>
</body>
- <!-- empty one to disable inherited from parent -->
- <googleAnalyticsAccountId></googleAnalyticsAccountId>
-
</project>
\ No newline at end of file
diff --git a/src/it/mskins-177-matomo-no-options/src/site/site.xml
b/src/it/mskins-177-matomo-no-options/src/site/site.xml
index cb0001e..55cd930 100644
--- a/src/it/mskins-177-matomo-no-options/src/site/site.xml
+++ b/src/it/mskins-177-matomo-no-options/src/site/site.xml
@@ -48,7 +48,4 @@
<head/>
</body>
- <!-- empty one to disable inherited from parent -->
- <googleAnalyticsAccountId></googleAnalyticsAccountId>
-
</project>
\ No newline at end of file
diff --git a/src/main/resources/META-INF/maven/site-macros.vm
b/src/main/resources/META-INF/maven/site-macros.vm
index eee343d..1f51f94 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -551,7 +551,8 @@ $indent </ul>##
#**##end
#end
##
-#macro ( googleAnalytics $accountId )
+#macro ( googleAnalytics )
+#set ( $accountId = $decoration.getCustomValue(
'fluidoSkin.googleAnalytics.accountId' ) )
#**##if( $accountId && $accountId != "" )
<!-- Google Analytics -->
<script>
diff --git a/src/main/resources/META-INF/maven/site.vm
b/src/main/resources/META-INF/maven/site.vm
index ec7fd58..fc6aebb 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -53,7 +53,7 @@
#* *#$render.eval( $decoration.body.head )
#**##end
#**##if( $headContent )$headContent#end
-#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
+#**##googleAnalytics()
#**##matomo()
#**##flattrHead()
#**##forkMeOnGitHubHead()
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 2266de0..26da301 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -201,7 +201,13 @@ Welcome to ${project.name}!
+-----+
<project name="xxx">
[...]
- <googleAnalytics>UA-12345...</googleAnalytics>
+ <custom>
+ <fluidoSkin>
+ <googleAnalytics>
+ <accountId>UA-12345...</accountId>
+ </googleAnalytics>
+ </fluidoSkin>
+ </custom>
[...]
</project>
+-----+
@@ -210,12 +216,11 @@ Welcome to ${project.name}!
+-----+
<project name="xxx">
- [...]
- <googleAnalytics>UA-12345...</googleAnalytics>
[...]
<custom>
<fluidoSkin>
<googleAnalytics>
+ <accountId>UA-12345...</accountId>
<anonymizeIp>true/false</anonymizeIp>
<forceSSL>true/false</forceSSL>
</googleAnalytics>
