Author: kwright
Date: Thu May 31 12:37:02 2012
New Revision: 1344681
URL: http://svn.apache.org/viewvc?rev=1344681&view=rev
Log:
Include .htaccess in site build
Modified:
incubator/lcf/site/trunk/.htaccess
incubator/lcf/site/trunk/build.xml
Modified: incubator/lcf/site/trunk/.htaccess
URL:
http://svn.apache.org/viewvc/incubator/lcf/site/trunk/.htaccess?rev=1344681&r1=1344680&r2=1344681&view=diff
==============================================================================
--- incubator/lcf/site/trunk/.htaccess (original)
+++ incubator/lcf/site/trunk/.htaccess Thu May 31 12:37:02 2012
@@ -15,19 +15,29 @@
Options +FollowSymlinks
RewriteEngine on
-#RewriteBase http://incubator.apache.org/connectors/
-rewriterule ^end-user-documentation\.html$
http://incubator.apache.org/connectors/en_US/end-user-documentation.html
[r=301,nc]
-rewriterule ^end-user-documentation\.pdf$
http://incubator.apache.org/connectors/en_US/end-user-documentation.pdf
[r=301,nc]
-rewriterule ^how-to-build-and-deploy\.html$
http://incubator.apache.org/connectors/en_US/how-to-build-and-deploy.html
[r=301,nc]
+
+rewriterule ^end-user-documentation\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/end-user-documentation.html
[r=301,nc]
+rewriterule ^end-user-documentation\.pdf$
http://incubator.apache.org/connectors/release/trunk/en_US/end-user-documentation.pdf
[r=301,nc]
+rewriterule ^how-to-build-and-deploy\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/how-to-build-and-deploy.html
[r=301,nc]
rewriterule ^developer-resources\.html$
http://incubator.apache.org/connectors/en_US/developer-resources.html
[r=301,nc]
rewriterule ^mail\.html$
http://incubator.apache.org/connectors/en_US/mail.html [r=301,nc]
rewriterule ^download\.html$
http://incubator.apache.org/connectors/en_US/download.html [r=301,nc]
-rewriterule ^javadoc\.html$
http://incubator.apache.org/connectors/en_US/javadoc.html [r=301,nc]
-rewriterule ^faq\.html$ http://incubator.apache.org/connectors/en_US/faq.html
[r=301,nc]
-rewriterule ^concepts\.html$
http://incubator.apache.org/connectors/en_US/concepts.html [r=301,nc]
-rewriterule ^performance-tuning\.html$
http://incubator.apache.org/connectors/en_US/performance-tuning.html [r=301,nc]
-rewriterule ^javadoc\.html$
http://incubator.apache.org/connectors/en_US/javadoc.html [r=301,nc]
+rewriterule ^javadoc\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/javadoc.html
[r=301,nc]
+rewriterule ^faq\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/faq.html [r=301,nc]
+rewriterule ^concepts\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/concepts.html
[r=301,nc]
+rewriterule ^performance-tuning\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/performance-tuning.html
[r=301,nc]
rewriterule ^who\.html$ http://incubator.apache.org/connectors/en_US/who.html
[r=301,nc]
-rewriterule ^script\.html$
http://incubator.apache.org/connectors/en_US/script.html [r=301,nc]
-rewriterule ^programmatic-operation\.html$
http://incubator.apache.org/connectors/en_US/programmatic-operation.html
[r=301,nc]
-rewriterule ^included-connectors\.html$
http://incubator.apache.org/connectors/en_US/included-connectors.html
[r=301,nc]
+rewriterule ^script\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/script.html
[r=301,nc]
+rewriterule ^programmatic-operation\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/programmatic-operation.html
[r=301,nc]
+rewriterule ^included-connectors\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/included-connectors.html
[r=301,nc]
+
+rewriterule ^en_US/end-user-documentation\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/end-user-documentation.html
[r=301,nc]
+rewriterule ^en_US/end-user-documentation\.pdf$
http://incubator.apache.org/connectors/release/trunk/en_US/end-user-documentation.pdf
[r=301,nc]
+rewriterule ^en_US/how-to-build-and-deploy\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/how-to-build-and-deploy.html
[r=301,nc]
+rewriterule ^en_US/javadoc\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/javadoc.html
[r=301,nc]
+rewriterule ^en_US/faq\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/faq.html [r=301,nc]
+rewriterule ^en_US/concepts\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/concepts.html
[r=301,nc]
+rewriterule ^en_US/performance-tuning\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/performance-tuning.html
[r=301,nc]
+rewriterule ^en_US/script\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/script.html
[r=301,nc]
+rewriterule ^en_US/programmatic-operation\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/programmatic-operation.html
[r=301,nc]
+rewriterule ^en_US/included-connectors\.html$
http://incubator.apache.org/connectors/release/trunk/en_US/included-connectors.html
[r=301,nc]
Modified: incubator/lcf/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/lcf/site/trunk/build.xml?rev=1344681&r1=1344680&r2=1344681&view=diff
==============================================================================
--- incubator/lcf/site/trunk/build.xml (original)
+++ incubator/lcf/site/trunk/build.xml Thu May 31 12:37:02 2012
@@ -46,6 +46,11 @@
<property name="release-base-url"
value="http://archive.apache.org/dist/incubator/manifoldcf"/>
</target>
+ <target name="transfer-htaccess">
+ <mkdir dir="build/site"/>
+ <copy todir="build/site" file=".htaccess"/>
+ </target>
+
<target name="download-release" depends="setup-release-base-url">
<mkdir dir="build/releases"/>
<get
src="${release-base-url}/apache-manifoldcf-${release-version}-bin.zip"
dest="build/releases/apache-manifoldcf-${release-version}-bin.zip"/>
@@ -395,7 +400,7 @@
</condition>
</target>
- <target name="build"
depends="setup-local-forrest,build-ipa-fonts,build-dejavu-fonts,get-releases-doc,dependencies-check"
if="dependenciesAvailable">
+ <target name="build"
depends="setup-local-forrest,build-ipa-fonts,build-dejavu-fonts,get-releases-doc,transfer-htaccess,dependencies-check"
if="dependenciesAvailable">
<dirname file="tmp/forrest/LICENSE.txt" property="forrest-dir"/>
<echo message="${forrest-dir}"/>
<exec executable="cmd.exe" dir="." searchpath="true"
failonerror="true" osfamily="windows">
