You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/01/01 02:17:38 UTC
[maven-fluido-skin] branch MSKINS-200 created (now c4376bc)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSKINS-200
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
at c4376bc [MSKINS-200] Remove deprecated Piwik integration
This branch includes the following new commits:
new c4376bc [MSKINS-200] Remove deprecated Piwik integration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-fluido-skin] 01/01: [MSKINS-200] Remove deprecated Piwik integration
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSKINS-200
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit c4376bc4b6c1a7fcf2f6e9574f1c58ffd674c215
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 1 03:17:01 2023 +0100
[MSKINS-200] Remove deprecated Piwik integration
This closes #41
---
pom.xml | 15 -----
src/it/mskins-75/pom.xml | 76 ------------------------
src/it/mskins-75/src/site/apt/index.apt.vm | 38 ------------
src/it/mskins-75/src/site/site.xml | 58 ------------------
src/it/mskins-75/verify.groovy | 35 -----------
src/main/resources/META-INF/maven/site-macros.vm | 33 ++--------
src/main/resources/META-INF/maven/site.vm | 3 +-
src/site/apt/ITs.apt | 2 -
src/site/apt/index.apt.vm | 28 ---------
9 files changed, 7 insertions(+), 281 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7298277..32e9095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,21 +623,6 @@ under the License.
<outputDirectory>${project.build.directory}/site/mskins-72/</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>copy-mskins-75</id>
- <phase>site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${project.build.directory}/it/mskins-75/target/site/</directory>
- </resource>
- </resources>
- <outputDirectory>${project.build.directory}/site/mskins-75/</outputDirectory>
- </configuration>
- </execution>
<execution>
<id>copy-mskins-76</id>
<phase>site</phase>
diff --git a/src/it/mskins-75/pom.xml b/src/it/mskins-75/pom.xml
deleted file mode 100644
index b57099d..0000000
--- a/src/it/mskins-75/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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/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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-skins</artifactId>
- <version>@project.parent.version@</version>
- </parent>
-
- <groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-75</artifactId>
- <version>@project.version@</version>
- <packaging>jar</packaging>
-
- <name>@project.name@ IT, MSKINS-75</name>
- <url>https://maven.apache.org/skins/@project.artifactId@/mskins-75/</url>
-
- <properties>
- <skinName>@project.name@</skinName>
- <skinDescription>@project.description@</skinDescription>
- <skinGroupId>@project.groupId@</skinGroupId>
- <skinArtifactId>@project.artifactId@</skinArtifactId>
- <skinVersion>@project.version@</skinVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>@sitePluginVersion@</version>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>@projectInfoReportsPluginVersion@</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
diff --git a/src/it/mskins-75/src/site/apt/index.apt.vm b/src/it/mskins-75/src/site/apt/index.apt.vm
deleted file mode 100644
index 85cc854..0000000
--- a/src/it/mskins-75/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,38 +0,0 @@
- ------
- ${project.name}
- ------
- Michael Koch
- ------
- 2013-02-17
- ------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-${project.name}
-
- This is a test for ${skinName} with Piwik web analytics tracking code.
- ${skinDescription}
-
- The Piwik tracking code is not visible on the page, look at the end of the page source to see it.
-
-* Actual configuration
-
-%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-75/src/site/site.xml b/src/it/mskins-75/src/site/site.xml
deleted file mode 100644
index dfea72c..0000000
--- a/src/it/mskins-75/src/site/site.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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-custom-config -->
- <custom>
- <fluidoSkin>
- <piwik>
- <piwikUrl>example.org/piwik</piwikUrl>
- <idsite>1</idsite>
- </piwik>
- </fluidoSkin>
- </custom>
- <!-- END SNIPPET: skin-custom-config -->
-
- <publishDate format="yyyy-MM-dd" position="right" />
- <version position="right" />
-
- <body>
- <breadcrumbs>
- <item name="Apache Maven Fluido Skin" href="https://maven.apache.org/skins/maven-fluido-skin/index.html" />
- <item name="Maven Fluido Skin ITs" href="https://maven.apache.org/skins/maven-fluido-skin/ITs.html" />
- </breadcrumbs>
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- </menu>
- </body>
-
-</project>
diff --git a/src/it/mskins-75/verify.groovy b/src/it/mskins-75/verify.groovy
deleted file mode 100644
index 8e37951..0000000
--- a/src/it/mskins-75/verify.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-File index = new File( basedir, "target/site/index.html" )
-assert index.exists()
-assert 1 == index.getText().count( '''\
- <!-- Piwik -->
- <script>
- var pkBaseURL = (("https:" == document.location.protocol) ? "https://example.org/piwik/" : "http://example.org/piwik/");
- document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js'%3E%3C/script%3E"));
- </script><script>
- try {
- var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
- piwikTracker.trackPageView();
- piwikTracker.enableLinkTracking();
- } catch( err ) {}
- </script><noscript><p><img src="http://example.org/piwik/piwik.php?idsite=1" style="border: 0;" alt="Piwik" /></p></noscript>
- <!-- End Piwik Tag -->
-'''.replace( "\n", System.getProperty( "line.separator" ) ) )
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index bff267e..eee343d 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -551,27 +551,6 @@ $indent </ul>##
#**##end
#end
##
-#macro ( piwik )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.piwik.piwikUrl' )
- && $decoration.getCustomChild( 'fluidoSkin.piwik.idsite' ) )
-#* *##set ( $piwikUrl = $decoration.getCustomValue( 'fluidoSkin.piwik.piwikUrl' ) )
-#* *##set ( $idsite = $decoration.getCustomValue( 'fluidoSkin.piwik.idsite' ) )
-##
- <!-- Piwik -->
- <script>
- var pkBaseURL = (("https:" == document.location.protocol) ? "https://$piwikUrl/" : "http://$piwikUrl/");
- document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js'%3E%3C/script%3E"));
- </script><script>
- try {
- var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $idsite);
- piwikTracker.trackPageView();
- piwikTracker.enableLinkTracking();
- } catch( err ) {}
- </script><noscript><p><img src="http://$piwikUrl/piwik.php?idsite=$idsite" style="border: 0;" alt="Piwik" /></p></noscript>
- <!-- End Piwik Tag -->
-#**##end
-#end
-##
#macro ( googleAnalytics $accountId )
#**##if( $accountId && $accountId != "" )
<!-- Google Analytics -->
@@ -592,20 +571,20 @@ $indent </ul>##
#**##end
#end
-#macro ( matomo $matomoDom )
+#macro ( matomo )
#**##if ( $decoration.getCustomValue( 'matomo.url' ) && $decoration.getCustomValue( 'matomo.url' ) != ''
&& $decoration.getCustomValue( 'matomo.siteId' ) && $decoration.getCustomValue( 'matomo.siteId' ) != '')
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
- #* *##foreach( $option in $matomoDom.getChild("options").getChildren() )
- #* *##if( $option.value && $option.value != "" )
+#* *##foreach( $option in $decoration.getCustomChild( 'matomo.options' ).getChildren() )
+#* *##if( $option.value && $option.value != "" )
_paq.push(['$option.name', '$option.value']);
- #* *##else
+#* *##else
_paq.push(['$option.name']);
- #* *##end
- #* *##end
+#* *##end
+#* *##end
(function() {
var u="$decoration.getCustomValue( 'matomo.url' )";
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 8c68b77..ec7fd58 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -54,7 +54,7 @@
#**##end
#**##if( $headContent )$headContent#end
#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
-#**##matomo( $decoration.custom.getChild('matomo') )
+#**##matomo()
#**##flattrHead()
#**##forkMeOnGitHubHead()
</head>
@@ -284,7 +284,6 @@
#* *##end
</div>
</footer>
-#**##piwik()
#**##anchorJS()
</body>
</html>
diff --git a/src/site/apt/ITs.apt b/src/site/apt/ITs.apt
index ac13f3d..1caafd0 100644
--- a/src/site/apt/ITs.apt
+++ b/src/site/apt/ITs.apt
@@ -78,8 +78,6 @@ Maven Fuido Skin ITs
* {{{./mskins-72/index.html}MSKINS-72}}
- * {{{./mskins-75/index.html}MSKINS-75}}
-
* {{{./mskins-76/index.html}MSKINS-76}}
* {{{./mskins-76_topbar/index.html}MSKINS-76 (topbar)}}
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 48c3943..2266de0 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -225,34 +225,6 @@ Welcome to ${project.name}!
</project>
+-----+
-
-** Piwik Web Analytics (deprecated)
-
- <This feature is deprecated since version 1.11.0 as it has been replaced by {{Matomo}} ({{{https://matomo.org/blog/2018/01/piwik-is-now-matomo/}Piwik is named Matomo since 2018}})>.
-
- Since version <<1.3.1>>, fluido-skin supports inserting {{{http://piwik.org/}Piwik web analytics}}
- {{{http://piwik.org/docs/javascript-tracking/#toc-where-can-i-find-the-piwik-tracking-code}tracking code}} into the generated pages.
- Users have to declare:
-
- * <<<custom.fluidoSkin.piwik.piwikUrl>>>: URL of the Piwik installation without protocol, leading and trailing slashes (i. e. without <<http://>>).
-
- * <<<custom.fluidoSkin.piwik.idsite>>>: ID in the Piwik installation of the site which is tracked.
-
-+-----+
-<project name="xxx">
- [...]
- <custom>
- <fluidoSkin>
- <piwik>
- <piwikUrl>example.org/piwik</piwikUrl>
- <idsite>1</idsite>
- </piwik>
- </fluidoSkin>
- </custom>
- [...]
-</project>
-+-----+
-
** Google Search
Users can optionally enable the <<Google Search>> for the generated site, requirements are: