You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/03/26 22:09:05 UTC
svn commit: r1305528 - in /maven/skins/trunk/maven-fluido-skin/src:
it/mskins-21/ it/mskins-21/invoker.properties it/mskins-21/pom.xml
it/mskins-21/src/ it/mskins-21/src/site/ it/mskins-21/src/site/site.xml
main/resources/META-INF/maven/site.vm
Author: rfscholte
Date: Mon Mar 26 20:09:05 2012
New Revision: 1305528
URL: http://svn.apache.org/viewvc?rev=1305528&view=rev
Log:
Fix MSKINS-21: Invalid text highlighting of license
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/invoker.properties
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
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-21/invoker.properties
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/invoker.properties?rev=1305528&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/invoker.properties (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/invoker.properties Mon Mar 26 20:09:05 2012
@@ -0,0 +1 @@
+invoker.maven.version = 3.0+
\ No newline at end of file
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/pom.xml?rev=1305528&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/pom.xml Mon Mar 26 20:09:05 2012
@@ -0,0 +1,83 @@
+<?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</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ </parent>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>@project.artifactId@-mskins-21</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>@project.name@ IT, MSKINS-21</name>
+ <url>http://maven.apache.org/skins/@project.artifactId@/mskins-21/</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>3.0-beta-3</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>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml?rev=1305528&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-21/src/site/site.xml Mon Mar 26 20:09:05 2012
@@ -0,0 +1,52 @@
+<?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>
+
+ <custom>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </custom>
+
+ <body>
+ <breadcrumbs>
+ <item name="skins" href="/skins/"/>
+ <item name="${skinArtifactId}" href="/skins/${skinArtifactId}/"/>
+ </breadcrumbs>
+
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
+
+</project>
\ 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=1305528&r1=1305527&r2=1305528&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 Mar 26 20:09:05 2012
@@ -952,18 +952,18 @@
#end
<div id="bodyColumn" #if ( $sideBarEnabled ) class="span9" #end>
- #if ( "Project License" != $title )
- #if ( $decoration.custom.getChild('fluidoSkin')
+ #if ( $title && $title.endsWith( "Project License" ) )
+ $bodyContent
+ #else
+ #if ( $decoration.custom.getChild('fluidoSkin')
&& $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sourceLineNumbersEnabled' )
&& 'true' == $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sourceLineNumbersEnabled' ).getValue() )
- #set ( $sourceStyle = "prettyprint linenums" )
- #else
- #set ( $sourceStyle = "prettyprint" )
- #end
+ #set ( $sourceStyle = "prettyprint linenums" )
+ #else
+ #set ( $sourceStyle = "prettyprint" )
+ #end
- $bodyContent.replaceAll( "<div class=\"source\"><pre>", "<div class=\"source\"><pre class=\"$sourceStyle\">" ).replaceAll( "class=\"bodyTable\"", "class=\"table table-striped\"" )
- #else
- $bodyContent
+ $bodyContent.replaceAll( "<div class=\"source\"><pre>", "<div class=\"source\"><pre class=\"$sourceStyle\">" ).replaceAll( "class=\"bodyTable\"", "class=\"table table-striped\"" )
#end
</div>
#if ( $sideBarEnabled )