This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
The following commit(s) were added to refs/heads/master by this push:
new a2fdfc1 [MSKINS-143] Allow setting GA options for forceSSL and
anonymizeIP
a2fdfc1 is described below
commit a2fdfc132f36d8eb67d0d55558ea70b77001f922
Author: Jens Reimann <jreim...@redhat.com>
AuthorDate: Fri Mar 23 13:16:01 2018 +0100
[MSKINS-143] Allow setting GA options for forceSSL and anonymizeIP
This change allows to set the GA tracker options for forceSSL
and anonymizeIP. This may be required due to data protection laws.
The default is to enable forceSSL and anonymizeIP.
This closes #2
---
pom.xml | 45 +++++++++++++++++
src/it/mskins-143_default/pom.xml | 58 ++++++++++++++++++++++
.../mskins-143_default/src/site/apt/index.apt.vm | 36 ++++++++++++++
src/it/mskins-143_default/src/site/site.xml | 38 ++++++++++++++
src/it/mskins-143_default/verify.groovy | 24 +++++++++
src/it/mskins-143_false/pom.xml | 58 ++++++++++++++++++++++
src/it/mskins-143_false/src/site/apt/index.apt.vm | 36 ++++++++++++++
src/it/mskins-143_false/src/site/site.xml | 49 ++++++++++++++++++
src/it/mskins-143_false/verify.groovy | 24 +++++++++
src/it/mskins-143_true/pom.xml | 58 ++++++++++++++++++++++
src/it/mskins-143_true/src/site/apt/index.apt.vm | 36 ++++++++++++++
src/it/mskins-143_true/src/site/site.xml | 49 ++++++++++++++++++
src/it/mskins-143_true/verify.groovy | 24 +++++++++
src/main/resources/META-INF/maven/site-macros.vm | 6 +++
src/site/apt/ITs.apt | 6 +++
src/site/apt/index.apt.vm | 31 ++++++++++++
16 files changed, 578 insertions(+)
diff --git a/pom.xml b/pom.xml
index cc7ae55..2ec5e2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -728,6 +728,51 @@ under the License.
<outputDirectory>${project.build.directory}/site/mskins-85/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-143_false</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/it/mskins-143_false/target/site/</directory>
+ </resource>
+ </resources>
+
<outputDirectory>${project.build.directory}/site/mskins-143_false/</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-mskins-143_true</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/it/mskins-143_true/target/site/</directory>
+ </resource>
+ </resources>
+
<outputDirectory>${project.build.directory}/site/mskins-143_true/</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-mskins-143_default</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/it/mskins-143_default/target/site/</directory>
+ </resource>
+ </resources>
+
<outputDirectory>${project.build.directory}/site/mskins-143_default/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/src/it/mskins-143_default/pom.xml
b/src/it/mskins-143_default/pom.xml
new file mode 100644
index 0000000..3e93f0e
--- /dev/null
+++ b/src/it/mskins-143_default/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>mskins-143_default</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <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>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_default/src/site/apt/index.apt.vm
b/src/it/mskins-143_default/src/site/apt/index.apt.vm
new file mode 100644
index 0000000..bd855b0
--- /dev/null
+++ b/src/it/mskins-143_default/src/site/apt/index.apt.vm
@@ -0,0 +1,36 @@
+ ------
+ ${project.name}
+ ------
+ Jens Reimann
+ ------
+ 2018-03-23
+ ------
+
+~~ 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 additional Google Analytics options.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-143_default/src/site/site.xml
b/src/it/mskins-143_default/src/site/site.xml
new file mode 100644
index 0000000..fdf3edc
--- /dev/null
+++ b/src/it/mskins-143_default/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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>
+
+ <body/>
+
+ <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_default/verify.groovy
b/src/it/mskins-143_default/verify.groovy
new file mode 100644
index 0000000..1ef21b4
--- /dev/null
+++ b/src/it/mskins-143_default/verify.groovy
@@ -0,0 +1,24 @@
+/*
+ * 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( '_gaq.push([\'_setAccount\',
\'FOO-BAR\']);' )
+assert 1 == index.getText().count( '_gaq.push([\'_gat._anonymizeIp\']);' )
+assert 1 == index.getText().count( '_gaq.push([\'_gat._forceSSL\']);' )
\ No newline at end of file
diff --git a/src/it/mskins-143_false/pom.xml b/src/it/mskins-143_false/pom.xml
new file mode 100644
index 0000000..b40d96d
--- /dev/null
+++ b/src/it/mskins-143_false/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>mskins-143_false</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <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>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_false/src/site/apt/index.apt.vm
b/src/it/mskins-143_false/src/site/apt/index.apt.vm
new file mode 100644
index 0000000..bd855b0
--- /dev/null
+++ b/src/it/mskins-143_false/src/site/apt/index.apt.vm
@@ -0,0 +1,36 @@
+ ------
+ ${project.name}
+ ------
+ Jens Reimann
+ ------
+ 2018-03-23
+ ------
+
+~~ 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 additional Google Analytics options.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-143_false/src/site/site.xml
b/src/it/mskins-143_false/src/site/site.xml
new file mode 100644
index 0000000..45875c6
--- /dev/null
+++ b/src/it/mskins-143_false/src/site/site.xml
@@ -0,0 +1,49 @@
+<?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>
+ <googleAnalytics>
+ <anonymizeIp>false</anonymizeIp>
+ <forceSSL>false</forceSSL>
+ </googleAnalytics>
+ </fluidoSkin>
+ </custom>
+ <!-- END SNIPPET: skin-custom-config -->
+
+ <body/>
+
+ <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_false/verify.groovy
b/src/it/mskins-143_false/verify.groovy
new file mode 100644
index 0000000..1249af4
--- /dev/null
+++ b/src/it/mskins-143_false/verify.groovy
@@ -0,0 +1,24 @@
+/*
+ * 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( '_gaq.push([\'_setAccount\',
\'FOO-BAR\']);' )
+assert 0 == index.getText().count( '_gaq.push([\'_gat._anonymizeIp\']);' )
+assert 0 == index.getText().count( '_gaq.push([\'_gat._forceSSL\']);' )
\ No newline at end of file
diff --git a/src/it/mskins-143_true/pom.xml b/src/it/mskins-143_true/pom.xml
new file mode 100644
index 0000000..f6bdd48
--- /dev/null
+++ b/src/it/mskins-143_true/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>mskins-143_true</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <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>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>true</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_true/src/site/apt/index.apt.vm
b/src/it/mskins-143_true/src/site/apt/index.apt.vm
new file mode 100644
index 0000000..bd855b0
--- /dev/null
+++ b/src/it/mskins-143_true/src/site/apt/index.apt.vm
@@ -0,0 +1,36 @@
+ ------
+ ${project.name}
+ ------
+ Jens Reimann
+ ------
+ 2018-03-23
+ ------
+
+~~ 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 additional Google Analytics options.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-143_true/src/site/site.xml
b/src/it/mskins-143_true/src/site/site.xml
new file mode 100644
index 0000000..77650a8
--- /dev/null
+++ b/src/it/mskins-143_true/src/site/site.xml
@@ -0,0 +1,49 @@
+<?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>
+ <googleAnalytics>
+ <anonymizeIp>true</anonymizeIp>
+ <forceSSL>true</forceSSL>
+ </googleAnalytics>
+ </fluidoSkin>
+ </custom>
+ <!-- END SNIPPET: skin-custom-config -->
+
+ <body/>
+
+ <googleAnalyticsAccountId>FOO-BAR</googleAnalyticsAccountId>
+
+</project>
\ No newline at end of file
diff --git a/src/it/mskins-143_true/verify.groovy
b/src/it/mskins-143_true/verify.groovy
new file mode 100644
index 0000000..1ef21b4
--- /dev/null
+++ b/src/it/mskins-143_true/verify.groovy
@@ -0,0 +1,24 @@
+/*
+ * 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( '_gaq.push([\'_setAccount\',
\'FOO-BAR\']);' )
+assert 1 == index.getText().count( '_gaq.push([\'_gat._anonymizeIp\']);' )
+assert 1 == index.getText().count( '_gaq.push([\'_gat._forceSSL\']);' )
\ 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 543ee67..d32243b 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -609,6 +609,12 @@ $indent </ul>##
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '$accountId']);
_gaq.push(['_trackPageview']);
+#**##if( $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.anonymizeIp',
'true' ) == 'true' )
+ _gaq.push(['_gat._anonymizeIp']);
+#**##end
+#**##if( $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.forceSSL',
'true' ) == 'true' )
+ _gaq.push(['_gat._forceSSL']);
+#**##end
(function() {
var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
diff --git a/src/site/apt/ITs.apt b/src/site/apt/ITs.apt
index 9f31ba2..7cf276d 100644
--- a/src/site/apt/ITs.apt
+++ b/src/site/apt/ITs.apt
@@ -82,5 +82,11 @@ Maven Fuido Skin ITs
* {{{./mskins-85/index.html}MSKINS-85}}
+ * {{{./mskins-143_default/index.html}MSKINS-143 (using defaults)}}
+
+ * {{{./mskins-143_false/index.html}MSKINS-143 (using explicit false)}}
+
+ * {{{./mskins-143_true/index.html}MSKINS-143 (using explicit true}}
+
[]
\ No newline at end of file
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 0302e2c..aab1c33 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -166,6 +166,37 @@ Welcome to ${project.name}!
</project>
+-----+
+** GoogleAnalytics
+
+ Users can optionally enable <<Google Analytics>> for the generated site:
+
++-----+
+<project name="xxx">
+ [...]
+ <googleAnalytics>UA-12345...</googleAnalytics>
+ [...]
+</project>
++-----+
+
+ By default, <<<forceSSL>>> and <<<anonymizeIp>>> are enabled. You can disable
both, but this might be illegal in several countries or regions (e.g., in the
EU due to GDPR):
+
++-----+
+<project name="xxx">
+ [...]
+ <googleAnalytics>UA-12345...</googleAnalytics>
+ [...]
+ <custom>
+ <fluidoSkin>
+ <googleAnalytics>
+ <anonymizeIp>true/false</anonymizeIp>
+ <forceSSL>true/false</forceSSL>
+ </googleAnalytics>
+ </fluidoSkin>
+ </custom>
+ [...]
+</project>
++-----+
+
** GoogleSearch
Users can optionally enable the <<Google Search>> for the generated site,
requirements are:
--
To stop receiving notification emails like this one, please contact
micha...@apache.org.
