maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1353196 - in /maven/skins/trunk/maven-fluido-skin: ./ src/it/mskins-41/ src/it/mskins-41/src/ src/it/mskins-41/src/site/ src/it/mskins-41/src/site/apt/ src/main/resources/META-INF/maven/ src/site/
Date Sat, 23 Jun 2012 20:25:55 GMT
Author: rfscholte
Date: Sat Jun 23 20:25:54 2012
New Revision: 1353196

URL: http://svn.apache.org/viewvc?rev=1353196&view=rev
Log:
Fix MSKINS-41: Links from site.xml are rendered in reverse order 

Added:
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/pom.xml
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/index.apt.vm
    maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/site.xml
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=1353196&r1=1353195&r2=1353196&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sat Jun 23 20:25:54 2012
@@ -524,6 +524,21 @@
                   <outputDirectory>${project.build.directory}/site/mskins-34_topbar/</outputDirectory>
                 </configuration>
               </execution>
+              <execution>
+                <id>copy-mskins-41</id>
+                <phase>site</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>${project.build.directory}/it/mskins-41/target/site/</directory>
+                    </resource>
+                  </resources>
+                  <outputDirectory>${project.build.directory}/site/mskins-41/</outputDirectory>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/pom.xml?rev=1353196&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/pom.xml Sat Jun 23 20:25:54 2012
@@ -0,0 +1,61 @@
+<?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-41</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>3.0</version>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/index.apt.vm?rev=1353196&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/index.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/apt/index.apt.vm Sat Jun
23 20:25:54 2012
@@ -0,0 +1,16 @@
+ ------
+ ${project.name}
+ ------
+ Andreas Sewe
+ ------
+ 2012-12-29
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with multiple links. They should be ordered as
+ listed in the <<<site.xml>>>. ${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-41/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/site.xml?rev=1353196&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-41/src/site/site.xml Sat Jun 23 20:25:54
2012
@@ -0,0 +1,47 @@
+<?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>
+    <!-- START SNIPPET: skin-custom-config -->
+    <links>
+      <item name="First Link" href="http://maven.apache.org/"/>
+      <item name="Second Link" href="http://maven.apache.org/"/>
+      <item name="Third Link" href="http://maven.apache.org/"/>
+    </links>
+    <!-- END SNIPPET: skin-custom-config -->
+    <menu name="Overview">
+      <item name="Introduction" href="index.html"/>
+    </menu>
+  </body>
+
+</project>

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=1353196&r1=1353195&r2=1353196&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 Jun
23 20:25:54 2012
@@ -162,7 +162,10 @@
 ##
 #macro ( links $links )
   #set ( $counter = 0 )
-  #foreach( $item in $links )
+  ## MSKINS-41
+  #set ( $begin = $links.size() - 1 )
+  #foreach( $index in [$begin..0] )
+    #set ( $item = $links.get( $index ) )
     #set ( $counter = $counter + 1 )
     #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
     #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )

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=1353196&r1=1353195&r2=1353196&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Sat Jun 23 20:25:54 2012
@@ -78,6 +78,7 @@ under the License.
       <item name="MSKINS-33 (topbar)" href="./mskins-33_topbar/index.html"/>
       <item name="MSKINS-34" href="./mskins-34/index.html"/>
       <item name="MSKINS-34 (topbar)" href="./mskins-34_topbar/index.html"/>
+      <item name="MSKINS-41" href="./mskins-41/index.html"/>
     </menu>
 
     <menu ref="reports"/>



Mime
View raw message