You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/07/10 06:06:07 UTC

svn commit: r792796 - in /maven/site/trunk: pom.xml src/site/filtered-resources/ src/site/filtered-resources/.htaccess src/site/resources/.htaccess

Author: brett
Date: Fri Jul 10 04:06:07 2009
New Revision: 792796

URL: http://svn.apache.org/viewvc?rev=792796&view=rev
Log:
remove symlinks and use .htaccess. USe manual filtering since the site plugin doesn't support .vm files for resources

Added:
    maven/site/trunk/src/site/filtered-resources/
    maven/site/trunk/src/site/filtered-resources/.htaccess
      - copied, changed from r792689, maven/site/trunk/src/site/resources/.htaccess
Removed:
    maven/site/trunk/src/site/resources/.htaccess
Modified:
    maven/site/trunk/pom.xml

Modified: maven/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=792796&r1=792795&r2=792796&view=diff
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Fri Jul 10 04:06:07 2009
@@ -285,6 +285,30 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <!-- here the phase you need -->
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/site</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>src/site/filtered-resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <outputEncoding>UTF-8</outputEncoding>

Copied: maven/site/trunk/src/site/filtered-resources/.htaccess (from r792689, maven/site/trunk/src/site/resources/.htaccess)
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/filtered-resources/.htaccess?p2=maven/site/trunk/src/site/filtered-resources/.htaccess&p1=maven/site/trunk/src/site/resources/.htaccess&r1=792689&r2=792796&rev=792796&view=diff
==============================================================================
--- maven/site/trunk/src/site/resources/.htaccess (original)
+++ maven/site/trunk/src/site/filtered-resources/.htaccess Fri Jul 10 04:06:07 2009
@@ -1,7 +1,10 @@
 ErrorDocument 404 /errors/404.html
 
-Redirect /ant-tasks.html http://maven.apache.org/ant-tasks/index.html
-Redirect /ant-tasks-release-notes.html http://maven.apache.org/ant-tasks/release-notes.html
+Redirect /ref/current http://maven.apache.org/ref/${current21xVersion}
+Redirect /ref/current-2.0.x http://maven.apache.org/ref/${current20xVersion}
+
+Redirect Permanent /ant-tasks.html http://maven.apache.org/ant-tasks/index.html
+Redirect Permanent /ant-tasks-release-notes.html http://maven.apache.org/ant-tasks/release-notes.html
 
 Redirect Permanent /guides/mini/guide-ibiblio-upload.html http://maven.apache.org/guides/mini/guide-central-repository-upload.html
 Redirect Permanent /faq.html http://maven.apache.org/general.html