Merge changes of revisions 462813, 472531, 488283 from trunk
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/commons/branches/commons-1_1@488365 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/KEYS b/KEYS
index 1621855..c0aee40 100644
--- a/KEYS
+++ b/KEYS
@@ -15,6 +15,8 @@
sub 1024g/41D98B12 2003-01-20
pub 1024D/7C611584 2005-07-19 Jeremias Märki <jeremias@apache.org>
sub 2048g/C0F1AD34 2005-07-19
+pub 1024D/4358C584 2006-12-08 Vincent Hennebert <vhennebert@apache.org>
+sub 2048g/0BD6AC9B 2006-12-08
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.0.6 (GNU/Linux)
@@ -93,3 +95,37 @@
UKHCLjnj2UtX8OfockTGIic=
=1nMU
-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+mQGiBEV5mbgRBACBd9xGOGzs8ah/N11zlDi8woJUh02EgztXdMfij4F3u12DkneC
+OIwGH14fWHdkhKjwYMi5LQfvBsnd3P5v5PTBxYati7ZQDDjvYsAJiMXbyUdszdyQ
+ig/UuNMwdB5YBrdtklzZcOuiNt/yeoocURQRwkwklsVBIYWwovcdXLTRWwCglPVQ
+0NrC7VPRPTgK0Y1wxOgwzj0D/RpwFEAcl1SJHoOwhwKykNzA05YABaxXhksKi2qQ
+C8M4mUofqweU3ocU0tBqQAR351n7hQWAaIs6ScOQtcKPJj9SV8SQgqxwj7WfHscj
+9X3lkP6cxstW+W8SblTgrKwl7JLLkja1u1cNUeD0QzWImuRBpOjh4s97ZFwSHRoH
+hCLgA/4/GDXbOhC4Wi9i8HHQNhEA6l86ZBteGq5u4SW57cK69mnOGj8iBxenIWeU
++NuB/LqVcG/75JnDvVGImvoykCBEl9xASNOj1C4HvBwNrU7iIpvRig1wwHK8/wqU
+Dhq5433rh40YbOfN0PLZDhQNhf3MysP3ipTZkVdwIKhsvl/vibQ2VmluY2VudCBI
+ZW5uZWJlcnQgPHZpbmNlbnQuaGVubmViZXJ0QGFueXdhcmUtdGVjaC5jb20+iGAE
+ExECACAFAkV5mgcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCgctTQQ1jF
+hH7uAJ9BFRNMuSpvSq//lEWLc6WOTMW70ACghjA0jtaMQUVjDU3RUOdGMRkqRZu0
+KVZpbmNlbnQgSGVubmViZXJ0IDx2aGVubmViZXJ0QGFwYWNoZS5vcmc+iGMEExEC
+ACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRXmahgIZAQAKCRCgctTQQ1jF
+hLRSAJ9KgHLa9V4Q2k0NFiMpPuhfnsK9bQCeJbGjFdIgrzyIvYIUZUPQGww597+5
+Ag0ERXmZwhAIAJhskbWZaLuwdZ3aLqVimVu65bR2ve1U28dfsSVCKx0uYCl3YJkj
+lF9P3BfMMPVdNRqDz4Agz/Vrn13j+p4ZQQhVhv6IGhE4p4T4RebMaZ/d30/6REls
+DP3Luc9IrnJbA72jSeXt+vI3WysB/wuJJ/kb+3KtFa1NowwVVypHCiSmme0VCUaR
+K6jlN0245IpR0IA4Q1VziRO7v1VufZAef64/2U2T/IthwPqDoThNj++9Zg5Tctrt
+TL02Z++n2Nj9bQf9R+FhA3YhvHuf6OLAPE2emcM/0As+JwBHqcMrmybnrxEJg0Aq
+4Q1k1Ka7beb35QJ7158rzL1PU1V2totLeW8AAwUH/1NJVnMD/p4op2kbJYMgKSqz
+zZfypt60aWeImeJ2qZD7FAtsz6KQu2a5ZkcVmyCeuAo9Sj0IqxXyn8Z6bHuHXNe+
+aidjS+n5kc2Y+5RQ1oMGV+BzXQMPGOgh0ertbLaairT7mCljTEd4kUGxOIcfAh/q
+Ie+p7Guvw6+T4K7hgfY8bAiVgzhZLWIFTQXpjU+91q6kTt4eIWjdCGdNQ/OBezGY
+f5SCy0phzTmRqcu68nKaLznwUpI7SuSFSIeVemGz602KdFsLEHHbZE0KJgd6aHYu
+ynK3sugKIpz/NXpT2vBsVkK6EP5xzWYOpqMGb8uQD8CT7loY81SK+rHBm7dicgiI
+SQQYEQIACQUCRXmZwgIbDAAKCRCgctTQQ1jFhBc3AKCQ1X7oIVR8g7GvSGEUw6DE
+HgEaUgCgkl30lcl9gGa9hqk4cuGYn1OTyks=
+=XphF
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/publish.xml b/publish.xml
index 87ae032..1c43fdf 100644
--- a/publish.xml
+++ b/publish.xml
@@ -18,7 +18,7 @@
<!--
This is the publishing file for ForrestBot.
-Running "ant -f publish.xml" will build the XML Graphics Commons site and deploy it using SCP on xmlgraphics.apache.org.
+Running "ant -f publish.xml" will build the XML Graphics Commons site and upload it to SVN. It has then to be checked out on people.apache.org to be deployed.
$Id$
-->
@@ -28,46 +28,27 @@
<property name="build.log-dir" location="./build/forrest/log"/>
<property name="getsrc.local.root-dir" location="."/>
+ <!--property name="getsrc.svn.url" value="http://svn.apache.org/repos/asf/xmlgraphics/commons/trunk"/-->
<target name="getsrc" depends="getsrc.clean-workdir, getsrc.local"/>
- <!-- create this secret file to be an ant project (not stored in CVS or SVN)
- that sets deploy.scp.user and deploy.scp.keyfile properties.
- See forrest/etc/publishing_our_site.txt
-
- Here's an example of such a file (place it one directory above the checkout directory):
- <project>
- <property name="deploy.scp.user" value="johndoe"/>
- <property name="deploy.scp.keyfile" value="/path/to/my/private/key"/>
- </project>
- -->
- <import file="../deploy.settings" optional="true"/>
-
- <property name="deploy.scp.host" value="people.apache.org"/>
- <property name="deploy.scp.dest" value="${deploy.scp.user}@${deploy.scp.host}:/www/xmlgraphics.apache.org/commons"/>
- <target name="deploy.scp-alt" unless="build.failed" description="FB: Deploy to a remote location via scp">
- <if>
- <not><isset property="deploy.scp.passphrase"/></not>
- <then>
- <input addproperty="deploy.scp.passphrase" message="Enter passphrase for your private key for scp to ${deploy.scp.dest}:"/>
- </then>
- </if>
- <scp todir="${deploy.scp.dest}" keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}">
- <fileset dir="${build.site-dir}"/>
- </scp>
+ <target name="build.fixCRLF" depends="build.forrest">
+ <fixcrlf srcdir="./build/forrest-docs" eol="lf">
+ <include name="**/*.htm*"/>
+ <include name="**/*.css"/>
+ <include name="**/*.xsl*"/>
+ <include name="**/*.js"/>
+ <include name="**/*.rdf"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.xml"/>
+ </fixcrlf>
</target>
- <target name="deploy.remote.fix.perms" depends="deploy.scp-alt" unless="build.failed" description="Fixes group permissions on newly uploaded files">
- <if>
- <not><isset property="deploy.scp.passphrase"/></not>
- <then>
- <input addproperty="deploy.scp.passphrase" message="Enter passphrase for your private key for scp to ${deploy.scp.dest}:"/>
- </then>
- </if>
- <!-- this is necessary because new files are not group writable -->
- <sshexec host="${deploy.scp.host}" username="${deploy.scp.user}"
- keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"
- command="cd /www/xmlgraphics.apache.org/commons;chgrp -R xmlgraphics *;chmod -R g+rw *"/>
- </target>
- <target name="deploy" depends="deploy.scp-alt, deploy.remote.fix.perms"/>
+
+ <target name="build" depends="build.forrest, build.fixCRLF"/>
+
+ <import file="../deploy.svn.settings" optional="true"/>
+
+ <property name="deploy.svn.url" value="https://svn.apache.org/repos/asf/xmlgraphics/site/deploy/commons/"/>
+ <target name="deploy" depends="deploy.svn"/>
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
diff --git a/status.xml b/status.xml
index 212dd02..6e99b2a 100644
--- a/status.xml
+++ b/status.xml
@@ -31,6 +31,8 @@
<action context="Code" dev="JM" type="add">
Added the start of an XMP metadata framework.
</action>
+ </release>
+ <release version="1.1" date="TBD">
<action context="Code" dev="JM" type="fix">
Various fixes and improvements in the ImageWriter abstraction.
</action>
