Changes how links to parent site are generated

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1448580 13f79535-47bb-0310-9956-ffa450edef68
rt-jar · Feb 21, 2013 · fe36e8b · fe36e8b
1 parent 66e9504
commit fe36e8b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.apache.struts</groupId>
@@ -72,7 +73,7 @@
             <name>The Apache Software License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
-            <comments />
+            <comments/>
         </license>
     </licenses>
 
@@ -89,7 +90,7 @@
         <tiles.version>2.0.6</tiles.version>
 
         <!-- SCM Site Configuration -->
-        <site.mainDirectory>${user.home}/struts2-site</site.mainDirectory>
+        <site.mainDirectory>${project.build.directory}/site</site.mainDirectory>
         <siteContent.path>${site.mainDirectory}/staging</siteContent.path>
         <scmCheckout.path>${site.mainDirectory}/scm</scmCheckout.path>
         <siteDeploy.url>file://${siteContent.path}</siteDeploy.url>
@@ -315,6 +316,7 @@
                 <version>3.1</version>
                 <configuration>
                     <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+                    <relativizeDecorationLinks>false</relativizeDecorationLinks>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -37,20 +37,23 @@
             <item name="Apache"
                   href="http://www.apache.org/"/>
             <item name="Struts"
-                  href="/"/>
+                  href="http://struts.apache.org/"/>
         </links>
         <menu name="Struts 2">
             <item name="Welcome"
                   href="index.html"/>
             <item name="Releases"
-                  href="downloads.html"/>
+                  href="http://struts.apache.org/downloads.html"/>
             <item name="Thanks!"
                   href="http://apache.org/foundation/thanks.html"/>
             <item name="Sponsorship"
                   href="http://apache.org/foundation/sponsorship.html"/>
         </menu>
 
-        <menu ref="parent" inherit="bottom" />
+        <menu name="Parent project">
+            <item name="Apache Struts"
+                  href="http://struts.apache.org/"/>
+        </menu>
 
         <menu name="Documentation">
             <item name="Getting Started"
@@ -65,7 +68,7 @@
 
         <menu name="Support">
             <item name="User Mailing List"
-                  href="mail.html"/>
+                  href="http://struts.apache.org/mail.html"/>
             <item name="Issue Tracker (JIRA)"
                   href="https://issues.apache.org/jira/browse/WW"/>
             <item name="Wiki Pages"
@@ -136,19 +139,19 @@
             <item name="Struts 2.x Draft Docs"
                   href="index.html"/>
             <item name="How to Help FAQ"
-                  href="helping.html"/>
+                  href="http://struts.apache.org/helping.html"/>
             <item name="Development Lists"
-                  href="dev/dev-mail.html"/>
+                  href="http://struts.apache.org/dev/dev-mail.html"/>
             <item name="Source Code"
-                  href="dev/builds.html"/>
+                  href="http://struts.apache.org/dev/builds.html"/>
             <item name="Release Guidelines"
-                  href="dev/releases.html"/>
+                  href="http://struts.apache.org/dev/releases.html"/>
             <item name="Volunteers"
-                  href="dev/volunteers.html"/>
+                  href="http://struts.apache.org/dev/volunteers.html"/>
             <item name="PMC Charter"
-                  href="dev/bylaws.html"/>
+                  href="http://struts.apache.org/dev/bylaws.html"/>
             <item name="Sandbox"
-                  href="struts-sandbox/index.html"/>
+                  href="http://struts.apache.org/struts-sandbox/index.html"/>
             <item name="Source Repository"
                   href="http://svn.apache.org/viewcvs.cgi/struts/"/>
         </menu>