diff --git a/pom.xml b/pom.xml index 72982771..32e9095b 100644 --- a/pom.xml +++ b/pom.xml @@ -623,21 +623,6 @@ under the License. ${project.build.directory}/site/mskins-72/ - - copy-mskins-75 - site - - copy-resources - - - - - ${project.build.directory}/it/mskins-75/target/site/ - - - ${project.build.directory}/site/mskins-75/ - - copy-mskins-76 site diff --git a/src/it/mskins-143_default/src/site/site.xml b/src/it/mskins-143_default/src/site/site.xml index 62d9e6d4..71c92ccd 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 @@ - + + + + FOO-BAR + + + - FOO-BAR - \ 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 36d6b744..e4f518e5 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 @@ + FOO-BAR false false @@ -49,6 +50,4 @@ - FOO-BAR - \ 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 5bef0f6c..e7054dc5 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 @@ + FOO-BAR true true @@ -49,6 +50,4 @@ - FOO-BAR - \ 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 fcc43fb6..e7269aa4 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 @@ - - - \ 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 cb0001ef..55cd9301 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 @@ - - - \ No newline at end of file diff --git a/src/it/mskins-75/pom.xml b/src/it/mskins-75/pom.xml deleted file mode 100644 index b57099d3..00000000 --- a/src/it/mskins-75/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.skins - maven-skins - @project.parent.version@ - - - org.apache.maven.skins.its - @project.artifactId@-mskins-75 - @project.version@ - jar - - @project.name@ IT, MSKINS-75 - https://maven.apache.org/skins/@project.artifactId@/mskins-75/ - - - @project.name@ - @project.description@ - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - - junit - junit - 3.8.2 - test - - - - - - - org.apache.maven.plugins - maven-site-plugin - @sitePluginVersion@ - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - @projectInfoReportsPluginVersion@ - - false - false - - - - - - 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 85cc8542..00000000 --- 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 dfea72cf..00000000 --- a/src/it/mskins-75/src/site/site.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - ${skinGroupId} - ${skinArtifactId} - ${skinVersion} - - - - - - - example.org/piwik - 1 - - - - - - - - - - - - - - - - - - - diff --git a/src/it/mskins-75/verify.groovy b/src/it/mskins-75/verify.groovy deleted file mode 100644 index 8e379519..00000000 --- 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( '''\ - - - -'''.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 bff267ea..1f51f94f 100644 --- a/src/main/resources/META-INF/maven/site-macros.vm +++ b/src/main/resources/META-INF/maven/site-macros.vm @@ -551,28 +551,8 @@ $indent ## #**##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' ) ) -## - - - -#**##end -#end -## -#macro ( googleAnalytics $accountId ) +#macro ( googleAnalytics ) +#set ( $accountId = $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.accountId' ) ) #**##if( $accountId && $accountId != "" )