Switching to SVN deployment with ForrestBot so everyone can do the FOP site deploymen...

This includes the FixCRLF operation to avoid any problems with mixed line endings in the generated files on Windows.
Deployment using "ant -f publish.xml deploy"

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@498325 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/publish.xml b/publish.xml
index bc5e3338f06aa0f6e56171981c5cab70529a3055..76a98295441aa518cbcbd644d25b156bc74ce9fd 100644 (file)
--- a/publish.xml
+++ b/publish.xml
@@ -18,7 +18,7 @@
 <!--\r
 This is the publishing file for ForrestBot.\r
 \r
-Running "ant -f publish.xml" will build the FOP site and deploy it using SCP on xmlgraphics.apache.org/fop.\r
+Running "ant -f publish.xml" will build the FOP site and upload it to SVN. It has then to be checked out on people.apache.org to be deployed.\r
 \r
 $Id$\r
 -->\r
@@ -31,44 +31,27 @@ $Id$
   <!--property name="getsrc.svn.url" value="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk"/-->\r
   <target name="getsrc" depends="getsrc.clean-workdir, getsrc.local"/>\r
   \r
-  <!-- create this secret file to be an ant project (not stored in CVS or SVN)\r
-    that sets deploy.scp.user and deploy.scp.keyfile properties.\r
-    See forrest/etc/publishing_our_site.txt\r
+  <target name="build.fixCRLF" depends="build.forrest">\r
+    <fixcrlf srcdir="./build/forrest-docs" eol="lf">\r
+      <include name="**/.htaccess"/>\r
+      <include name="**/*.htm*"/>\r
+      <include name="**/*.css"/>\r
+      <include name="**/*.xsl*"/>\r
+      <include name="**/*.js"/>\r
+      <include name="**/*.rdf"/>\r
+      <include name="**/*.txt"/>\r
+      <include name="**/*.xml"/>\r
+      <include name="**/*.fo"/>\r
+      <include name="**/*.svg"/>\r
+    </fixcrlf>\r
+  </target>\r
+  \r
+  <target name="build" depends="build.forrest, build.fixCRLF"/>\r
 \r
-    Here's an example of such a file (place it one directory above the checkout directory):\r
-    <project>\r
-      <property name="deploy.scp.user" value="johndoe"/>\r
-      <property name="deploy.scp.keyfile" value="/path/to/my/private/key"/>\r
-    </project>\r
-   -->\r
-  <import file="../deploy.settings" optional="true"/>\r
+  <import file="../deploy.svn.settings" optional="true"/>\r
 \r
-  <property name="deploy.scp.host" value="people.apache.org"/>\r
-  <property name="deploy.scp.dest" value="${deploy.scp.user}@${deploy.scp.host}:/www/xmlgraphics.apache.org/fop"/>\r
-  <target name="deploy.scp-alt" unless="build.failed" description="FB: Deploy to a remote location via scp">\r
-    <if>\r
-      <not><isset property="deploy.scp.passphrase"/></not>\r
-      <then>\r
-        <input addproperty="deploy.scp.passphrase" message="Enter passphrase for your private key for scp to ${deploy.scp.dest}:"/>\r
-      </then>\r
-    </if>\r
-    <scp todir="${deploy.scp.dest}" keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}">\r
-     <fileset dir="${build.site-dir}"/>\r
-    </scp>\r
-  </target>\r
-  <target name="deploy.remote.fix.perms" depends="deploy.scp-alt" unless="build.failed" description="Fixes group permissions on newly uploaded files">\r
-    <if>\r
-      <not><isset property="deploy.scp.passphrase"/></not>\r
-      <then>\r
-        <input addproperty="deploy.scp.passphrase" message="Enter passphrase for your private key for scp to ${deploy.scp.dest}:"/>\r
-      </then>\r
-    </if>\r
-    <!-- this is necessary because new files are not group writable -->\r
-    <sshexec host="${deploy.scp.host}" username="${deploy.scp.user}" \r
-        keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"\r
-        command="cd /www/xmlgraphics.apache.org/fop;chgrp -R xmlgraphics *;chmod -R g+rw *"/>\r
-  </target>\r
-  <target name="deploy" depends="deploy.scp-alt, deploy.remote.fix.perms"/>\r
+  <property name="deploy.svn.url" value="https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/fop/"/>\r
+  <target name="deploy" depends="deploy.svn"/>\r
 \r
   <property environment="env"/>\r
   <import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>\r