maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1311435 - in /maven/skins/trunk/maven-fluido-skin/src: it/mskins-47/ it/mskins-47/src/ it/mskins-47/src/site/ it/mskins-47/src/site/apt/ main/resources/META-INF/maven/
Date Mon, 09 Apr 2012 20:43:28 GMT
Author: rfscholte
Date: Mon Apr  9 20:43:27 2012
New Revision: 1311435

URL: http://svn.apache.org/viewvc?rev=1311435&view=rev
Log:
Fix MSKINS-47: $headContent can be undefined when using an older doxia-site-renderer

Added:
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/pom.xml
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/index.apt.vm
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/site.xml
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/verify.groovy
Modified:
    maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/pom.xml?rev=1311435&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/pom.xml Mon Apr  9 20:43:27 2012
@@ -0,0 +1,48 @@
+<?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>@project.artifactId@-mskins-47</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>@project.name@ IT, MSKINS-47</name>
+  <url>http://maven.apache.org/skins/@project.artifactId@/mskins-47/</url>
+
+  <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>2.0</version>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/index.apt.vm?rev=1311435&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/index.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/apt/index.apt.vm Mon Apr
 9 20:43:27 2012
@@ -0,0 +1,16 @@
+ ------
+ ${project.name}
+ ------
+ Robert Scholte
+ ------
+ 2012-04-09
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} and a very old version of the maven-site-plugin
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/site.xml?rev=1311435&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/src/site/site.xml Mon Apr  9 20:43:27
2012
@@ -0,0 +1,34 @@
+<?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>
+
+</project>

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/verify.groovy
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/verify.groovy?rev=1311435&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/verify.groovy (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-47/verify.groovy Mon Apr  9 20:43:27
2012
@@ -0,0 +1,3 @@
+File index = new File( basedir, "target/site/index.html" )
+assert index.exists()
+assert !index.getText().contains( '$headContent' )
\ No newline at end of file

Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1311435&r1=1311434&r2=1311435&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Mon Apr
 9 20:43:27 2012
@@ -768,7 +768,7 @@
 #if ( $locale )
     <meta http-equiv="Content-Language" content="$locale.language" />
 #end
-    $headContent
+    #if( $headContent )$headContent#end
     #googleAnalytics( $decoration.googleAnalyticsAccountId )
   </head>
     #if ( $decoration.custom.getChild( 'fluidoSkin' )



Mime
View raw message