Author: simonetripodi
Date: Sat Mar 17 19:43:59 2012
New Revision: 1301984
URL: http://svn.apache.org/viewvc?rev=1301984&view=rev
Log:
[MSKINS-31] If you have no <body> you get error on rendering
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml (with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
(with props)
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
(with props)
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-fluido-skin/src/site/site.xml
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1301984&r1=1301983&r2=1301984&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sat Mar 17 19:43:59 2012
@@ -419,6 +419,21 @@
<outputDirectory>${project.build.directory}/site/mskins-25/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-31</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/it/mskins-31/target/site/</directory>
+ </resource>
+ </resources>
+
<outputDirectory>${project.build.directory}/site/mskins-31/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml?rev=1301984&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml Sat Mar 17
19:43:59 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-31</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>@project.name@ IT, MSKINS-31</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-31/</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>3.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml?rev=1301984&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
(added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
Sat Mar 17 19:43:59 2012
@@ -0,0 +1,37 @@
+<?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>
+
+ <publishDate format="yyyy-MM-dd" position="right" />
+ <version position="right" />
+
+</project>
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/apt/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml?rev=1301984&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
(added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml Sat
Mar 17 19:43:59 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>
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-31/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=1301984&r1=1301983&r2=1301984&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
Sat Mar 17 19:43:59 2012
@@ -794,9 +794,13 @@
#end
#end
+ ## MSKINS-31
+ #if( $decoration.body && $decoration.body.menus )
<ul>
#topMenu( $decoration.body.menus )
</ul>
+ #end
+
#if ( $searchEnabled && !$sideBarEnabled )
#googleSearch(true)
#end
@@ -805,7 +809,10 @@
#followTwitter( $sideBarEnabled )
#end
- #if( $decoration.body.links.size() > 0 )
+ ## MSKINS-31
+ #if( $decoration.body
+ && $decoration.body.links
+ && $decoration.body.links.size() > 0 )
<ul class="nav secondary-nav">
<li class="menu">
<a href="#" class="menu">External Links</a>
Modified: maven/skins/trunk/maven-fluido-skin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/site.xml?rev=1301984&r1=1301983&r2=1301984&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Sat Mar 17 19:43:59
2012
@@ -65,6 +65,7 @@ under the License.
<item name="MSKINS-24" href="./mskins-24/index.html"/>
<item name="MSKINS-24 (topbar)" href="./mskins-24_topbar/index.html"/>
<item name="MSKINS-25" href="./mskins-25/index.html"/>
+ <item name="MSKINS-31" href="./mskins-31/index.html"/>
</menu>
<menu ref="reports"/>
