Author: gadams
Date: Sun Oct 21 19:40:19 2012
New Revision: 1400707
URL: http://svn.apache.org/viewvc?rev=1400707&view=rev
Log:
Merge from ^/branches/fop-1_1.
Added:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar (with props)
xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.1/
- copied from r1400688,
xmlgraphics/fop/branches/fop-1_1/src/documentation/content/xdocs/1.1/
Removed:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar
xmlgraphics/fop/trunk/src/documentation/content/xdocs/1.1rc1/
Modified:
xmlgraphics/fop/trunk/ (props changed)
xmlgraphics/fop/trunk/README
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/src/documentation/content/.htaccess
xmlgraphics/fop/trunk/src/documentation/content/doap.rdf
xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/branches/fop-1_1:r1364036-1400689,1400697
Modified: xmlgraphics/fop/trunk/README
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/README?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/README (original)
+++ xmlgraphics/fop/trunk/README Sun Oct 21 19:40:19 2012
@@ -16,21 +16,21 @@ Contents of this file:
What is FOP?
----------------
+------------
-Apache FOP is the world's first print formatter driven by XSL formatting
-objects. It is a Java application that reads a formatting object tree
-conforming to the XSL 1.1 Recommendation (05 December 2006) and then turns it
-into a PDF document, certain other output formats or allows you to preview it
-directly on screen. Note that not all parts of the XSL 1.1 specification
-have yes been implemented.
+Apache FOP is a print formatter driven by XSL formatting objects. It is a Java
+application that reads a formatting object tree conforming to the XSL 1.1
+Recommendation (05 December 2006) and then turns it into a PDF document,
+certain other output formats or allows you to preview it directly on screen.
+Note that not all parts of the XSL 1.1 specification have yet been
+implemented.
Apache FOP is part of Apache's XML Graphics project. The homepage of Apache
FOP is http://xmlgraphics.apache.org/fop/.
Legal Information
----------------------
+-----------------
Apache FOP is published under the Apache License version 2.0. For the license
text, please see the following files:
@@ -54,7 +54,7 @@ License version 2.0:
Where to get help?
----------------------
+------------------
http://xmlgraphics.apache.org/fop/gethelp.html
@@ -70,7 +70,7 @@ Please report bugs to bugzilla at http:/
How do I build FOP?
-----------------------
+-------------------
If you've downloaded a binary distribution, you don't need to build
FOP.
@@ -80,7 +80,7 @@ http://xmlgraphics.apache.org/fop/stable
How do I run FOP?
---------------------
+-----------------
Simply by typing "fop" on the command-line. Without any parameters you
will receive a screen with instruction on how to call FOP from the
@@ -93,12 +93,11 @@ http://xmlgraphics.apache.org/fop/stable
RELEASE NOTES
==============================================================================
-Version 1.1rc1
-==============
+Version 1.1
+===========
-This is a candidate release of the next, minor (dot) release of Apache FOP,
-which primarily addresses bug fixes and also adds a number of new features.
-See below for details.
+This release of Apache FOP primarily addresses bug fixes and also adds a number
+of new features. See below for details.
Compliance
----------
@@ -113,22 +112,16 @@ Known issues
A detailed list of known issues in this release is available at
http://xmlgraphics.apache.org/fop/1.1/knownissues_overview.html.
-Major Changes in Version 1.1rc1
--------------------------------
+Major Changes in Version 1.1
+----------------------------
-* Adds support for complex scripts, in particular those that require
- either bidirectional processing or advanced typographic tables in
- fonts (e.g., the GSUB and GPOS tables of OpenType).
-* Adds support for fo:bidi-override and (relatively) full support
- for writing-mode='rl-tb' (or equivalent).
-* Adds support for Unicode BIDI Control characters: U+200E LEFT-TO-RIGHT
- MARK (LRM), U+200F RIGHT-TO-LEFT MARK (RLM), U+202A LEFT-TO-RIGHT EMBEDDING
- (LRE), U+202B RIGHT-TO-LEFT EMBEDDING (RLE), U+202D LEFT-TO-RIGHT OVERRIDE
- (LRO), U+202E RIGHT-TO-LEFT OVERRIDE (RLO), and U+202C POP DIRECTIONAL
- FORMATTING (PDF).
+* Adds support for complex scripts.
+* Adds support for TTF fonts in PostScript.
+* Adds support for PDF Object Streams.
+* Adds support for PDF 128-bit encryption.
A more detailed list of changes in this release is available at
-http://xmlgraphics.apache.org/fop/1.1rc1/changes_1.1rc1.html.
+http://xmlgraphics.apache.org/fop/1.1/changes_1.1.html.
A more detailed list of changes in this and earlier releases is available at
http://xmlgraphics.apache.org/fop/changes.html.
Modified: xmlgraphics/fop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Sun Oct 21 19:40:19 2012
@@ -58,62 +58,68 @@ list of possible build targets.
<property file="${basedir}/build-local.properties"/>
<property file="${basedir}/build.properties"/>
<fileset dir="${basedir}" id="dist.bin">
- <include name="conf/**"/>
- <include name="examples/**"/>
+ <include name="KEYS"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
<include name="README"/>
- <include name="KEYS"/>
- <include name="status.xml"/>
+ <include name="conf/**"/>
+ <include name="examples/**"/>
+ <include name="fop"/>
<include name="fop.bat"/>
<include name="fop.cmd"/>
<include name="fop.js"/>
- <include name="fop"/>
+ <include name="status.xml"/>
</fileset>
<fileset dir="${basedir}" id="dist.bin.lib">
<patternset id="dist.lib">
+ <include name="lib/README*"/>
<include name="lib/avalon-framework*"/>
- <include name="lib/xmlgraphics-commons*"/>
<include name="lib/batik*"/>
<include name="lib/commons-io*"/>
<include name="lib/commons-logging*"/>
- <include name="lib/README*"/>
<include name="lib/serializer*"/>
<include name="lib/xalan*"/>
<include name="lib/xerces*"/>
<include name="lib/xml-apis*"/>
+ <include name="lib/xmlgraphics-commons*"/>
</patternset>
</fileset>
- <patternset id="dist.src.lib.tools">
+ <patternset id="dist.src.lib.build">
<include name="lib/build/asm*"/>
- <include name="lib/build/backport-util-concurrent*"/>
+ <include name="lib/build/hamcrest*"/>
<include name="lib/build/jaxen*"/>
+ <include name="lib/build/mockito*"/>
+ <include name="lib/build/objenesis*"/>
<include name="lib/build/pmd*"/>
<include name="lib/build/qdox*"/>
<include name="lib/build/xmlunit*"/>
</patternset>
<fileset dir="${basedir}" id="dist.src">
- <include name="src/**"/>
- <include name="conf/**"/>
- <include name="hyph/hyphenation.dtd"/>
- <include name="hyph/readme"/>
- <patternset refid="dist.lib"/>
- <patternset refid="dist.src.lib.tools"/>
- <include name="lib/servlet*"/>
- <include name="test/**"/>
- <include name="examples/**"/>
+ <include name="KEYS"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
<include name="README"/>
- <include name="KEYS"/>
- <include name="known-issues.xml"/>
- <include name="status.xml"/>
<include name="build.*"/>
- <include name="forrest.properties"/>
+ <include name="checkstyle*"/>
+ <exclude name="checkstyle-noframes.xsl"/>
+ <include name="conf/**"/>
+ <include name="examples/**"/>
+ <include name="findbugs*"/>
+ <include name="fop"/>
<include name="fop.bat"/>
<include name="fop.cmd"/>
<include name="fop.js"/>
- <include name="fop"/>
+ <include name="forrest.*"/>
+ <include name="hyph/hyphenation.dtd"/>
+ <include name="hyph/readme"/>
+ <include name="jacoco*"/>
+ <include name="known-issues.xml"/>
+ <include name="lib/servlet*"/>
+ <include name="src/**"/>
+ <include name="status.xml"/>
+ <include name="test/**"/>
+ <patternset refid="dist.lib"/>
+ <patternset refid="dist.src.lib.build"/>
</fileset>
<path id="libs-build-classpath">
<fileset dir="${basedir}/lib">
@@ -1251,23 +1257,110 @@ NOTE:
<gzip zipfile="${name}-${version}-src.tar.gz"
src="${name}-${version}-src.tar"/>
<delete file="${name}-${version}-src.tar"/>
</target>
+ <target name="release-dist" depends="dist" description="Generates the
distribution package and signs the release">
+ <property name="bin.suffix" value="bin"/>
+ <input message="Passphrase for your default private key (attention:
passphrase will be echoed in clear text on the display!)" addproperty="pwd"/>
+ <antcall target="md5">
+ <param name="sign.archive" value="${name}-${version}-src.zip"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive" value="${name}-${version}-src.zip"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive" value="${name}-${version}-src.tar.gz"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive" value="${name}-${version}-src.tar.gz"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive" value="${name}-${version}-${bin.suffix}.zip"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive" value="${name}-${version}-${bin.suffix}.zip"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive"
value="${name}-${version}-${bin.suffix}.tar.gz"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive"
value="${name}-${version}-${bin.suffix}.tar.gz"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ </target>
+ <target name="md5">
+ <property name="md5.exec" value="md5sum"/>
+ <property name="md5.options" value=""/>
+ <exec executable="${md5.exec}" output="${sign.archive}.md5">
+ <arg line="${md5.options} ${sign.archive}"/>
+ </exec>
+ </target>
+ <target name="sign-file">
+ <property name="gpg.exec" value="gpg"/>
+ <property name="gpg.options" value="--armor --detach-sign --force-v3-sigs
--batch --verbose --passphrase-fd 0"/>
+ <delete file="${sign.archive}.asc"/>
+ <exec executable="${gpg.exec}" inputstring="${pwd}">
+ <arg line="${gpg.options} ${sign.archive}"/>
+ </exec>
+ </target>
<!-- =================================================================== -->
<!-- Maven artifacts -->
<!-- =================================================================== -->
<target name="maven-artifacts" depends="jar-main, jar-sources, jar-javadocs"
description="Builds a Maven artifact that can be uploaded to a Maven
repository">
- <filter token="version" value="${version}"/>
+ <filter token="version" value="${version}"/>
<mkdir dir="${build.dir}/maven"/>
<copy file="${basedir}/xmlgraphics-fop-pom-template.pom"
tofile="${build.dir}/maven/pom.xml" filtering="true"/>
- <copy file="${build.dir}/${name}.jar"
tofile="${build.dir}/maven/${name}-${version}.jar"/>
+ <copy file="${build.dir}/${name}.jar"
tofile="${build.dir}/${name}-${version}.jar"/>
+ <fileset id="bundle-files" dir="${build.dir}">
+ <patternset>
+ <include name="${name}-${version}.jar"/>
+ <include name="${name}-${version}-sources.jar"/>
+ <include name="${name}-${version}-javadoc.jar"/>
+ </patternset>
+ <patternset>
+ <include name="maven/pom.xml"/>
+ </patternset>
+ </fileset>
+ <checksum algorithm="md5">
+ <fileset refid="bundle-files"/>
+ </checksum>
+ <checksum algorithm="sha1">
+ <fileset refid="bundle-files"/>
+ </checksum>
+ <input message="Passphrase for your default private key (attention:
passphrase will be echoed in clear text on the display!)" addproperty="pwd"/>
+ <antcall target="sign-file">
+ <param name="sign.archive" value="${build.dir}/${name}-${version}.jar"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive"
value="${build.dir}/${name}-${version}-sources.jar"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive"
value="${build.dir}/${name}-${version}-javadoc.jar"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
+ <antcall target="sign-file">
+ <param name="sign.archive" value="${build.dir}/maven/pom.xml"/>
+ <param name="pwd" value="${pwd}"/>
+ </antcall>
<jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
<manifest>
- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java
${javac.target}])"/>
+ <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
</manifest>
<fileset dir="${build.dir}">
- <include name="${name}-${version}-sources.jar"/>
- <include name="${name}-${version}-javadoc.jar"/>
+ <patternset>
+ <include name="${name}-${version}.jar*"/>
+ <include name="${name}-${version}-sources.jar*"/>
+ <include name="${name}-${version}-javadoc.jar*"/>
+ </patternset>
+ </fileset>
+ <fileset dir="${build.dir}/maven">
+ <patternset>
+ <include name="pom.xml*"/>
+ </patternset>
</fileset>
- <fileset dir="${build.dir}/maven"/>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
</jar>
<move file="${build.dir}/${name}-${version}-bundle.jar"
todir="${basedir}"/>
Added: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar?rev=1400707&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: xmlgraphics/fop/trunk/src/documentation/content/.htaccess
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/.htaccess?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/.htaccess (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/.htaccess Sun Oct 21
19:40:19 2012
@@ -1,34 +1,34 @@
# redirect moved files
-RedirectMatch Permanent ^/fop/anttask(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/anttask$1
-RedirectMatch Permanent ^/fop/compiling(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/compiling$1
-RedirectMatch Permanent ^/fop/configuration(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/configuration$1
-RedirectMatch Permanent ^/fop/embedding(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/embedding$1
-RedirectMatch Permanent ^/fop/extensions(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/extensions$1
-RedirectMatch Permanent ^/fop/fonts(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/fonts$1
-RedirectMatch Permanent ^/fop/graphics(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/graphics$1
-RedirectMatch Permanent ^/fop/hyphenation(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/hyphenation$1
-RedirectMatch Permanent ^/fop/intermediate(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/intermediate$1
-RedirectMatch Permanent ^/fop/output(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/output$1
-RedirectMatch Permanent ^/fop/pdfa(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/pdfa$1
-RedirectMatch Permanent ^/fop/pdfencryption(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/pdfencryption$1
-RedirectMatch Permanent ^/fop/pdfx(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/pdfx$1
-RedirectMatch Permanent ^/fop/running(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/running$1
-RedirectMatch Permanent ^/fop/servlets(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/servlets$1
-RedirectMatch Permanent ^/fop/upgrading(.*)
http://xmlgraphics.apache.org/fop/1.1rc1/upgrading$1
+RedirectMatch Permanent ^/fop/anttask(.*)
http://xmlgraphics.apache.org/fop/1.1/anttask$1
+RedirectMatch Permanent ^/fop/compiling(.*)
http://xmlgraphics.apache.org/fop/1.1/compiling$1
+RedirectMatch Permanent ^/fop/configuration(.*)
http://xmlgraphics.apache.org/fop/1.1/configuration$1
+RedirectMatch Permanent ^/fop/embedding(.*)
http://xmlgraphics.apache.org/fop/1.1/embedding$1
+RedirectMatch Permanent ^/fop/extensions(.*)
http://xmlgraphics.apache.org/fop/1.1/extensions$1
+RedirectMatch Permanent ^/fop/fonts(.*)
http://xmlgraphics.apache.org/fop/1.1/fonts$1
+RedirectMatch Permanent ^/fop/graphics(.*)
http://xmlgraphics.apache.org/fop/1.1/graphics$1
+RedirectMatch Permanent ^/fop/hyphenation(.*)
http://xmlgraphics.apache.org/fop/1.1/hyphenation$1
+RedirectMatch Permanent ^/fop/intermediate(.*)
http://xmlgraphics.apache.org/fop/1.1/intermediate$1
+RedirectMatch Permanent ^/fop/output(.*)
http://xmlgraphics.apache.org/fop/1.1/output$1
+RedirectMatch Permanent ^/fop/pdfa(.*)
http://xmlgraphics.apache.org/fop/1.1/pdfa$1
+RedirectMatch Permanent ^/fop/pdfencryption(.*)
http://xmlgraphics.apache.org/fop/1.1/pdfencryption$1
+RedirectMatch Permanent ^/fop/pdfx(.*)
http://xmlgraphics.apache.org/fop/1.1/pdfx$1
+RedirectMatch Permanent ^/fop/running(.*)
http://xmlgraphics.apache.org/fop/1.1/running$1
+RedirectMatch Permanent ^/fop/servlets(.*)
http://xmlgraphics.apache.org/fop/1.1/servlets$1
+RedirectMatch Permanent ^/fop/upgrading(.*)
http://xmlgraphics.apache.org/fop/1.1/upgrading$1
# redirect to versioned documentation
# Current stable release
-Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.1
# Current unstable release (or trunk if no beta is the latest release)
-Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/1.1rc1
+Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
# Latest release
-Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0
-Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.1
+Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.1
# Previous stable release
-Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.95
+Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/1.0
# Old releases
Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.95
Modified: xmlgraphics/fop/trunk/src/documentation/content/doap.rdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/doap.rdf?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/doap.rdf (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/doap.rdf Sun Oct 21
19:40:19 2012
@@ -75,14 +75,14 @@
</asfext:implements>
<release>
<Version>
- <name>Upcoming release (candidate)</name>
- <created>2012-07-02</created>
- <revision>1.1rc1</revision>
+ <name>Current release (stable)</name>
+ <created>2012-10-20</created>
+ <revision>1.1</revision>
</Version>
</release>
<release>
<Version>
- <name>Current release (stable)</name>
+ <name>Previous release (stable)</name>
<created>2010-07-21</created>
<revision>1.0</revision>
</Version>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/compliance.ihtml Sun
Oct 21 19:40:19 2012
@@ -561,7 +561,7 @@
</tr>
<tr>
<th align="center">1.0 (stable)</th>
- <th align="center">1.1 (rc1)</th>
+ <th align="center">1.1 (stable)</th>
<th align="center">development</th>
</tr>
@@ -1492,7 +1492,7 @@
</tr>
<tr>
<th align="center">1.0 (stable)</th>
- <th align="center">1.1 (rc1)</th>
+ <th align="center">1.1 (stable)</th>
<th align="center">develop- ment</th>
</tr>
@@ -4643,7 +4643,7 @@
</tr>
<tr>
<th align="center">1.0 (stable)</th>
- <th align="center">1.1 (rc1)</th>
+ <th align="center">1.1 (stable)</th>
<th align="center">development</th>
</tr>
<tr>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/download.xml Sun Oct
21 19:40:19 2012
@@ -85,26 +85,26 @@
<p/>
<table>
<tr>
- <th colspan="2">This Candidate Release</th>
+ <th colspan="2">Latest Stable Release</th>
</tr>
<tr>
<td>Repository URL</td>
<td>
- <link
href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/";>
-
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/</code>
+ <link
href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/";>
+
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/</code>
</link>
</td>
</tr>
<tr>
<td>Web view</td>
<td>
- <link
href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/";>
-
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/</code>
+ <link
href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/";>
+
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/</code>
</link>
</td>
</tr>
<tr>
- <th colspan="2">Latest Stable Release</th>
+ <th colspan="2">Previous Stable Release</th>
</tr>
<tr>
<td>Repository URL</td>
@@ -123,25 +123,6 @@
</td>
</tr>
<tr>
- <th colspan="2">Previous Stable Release</th>
- </tr>
- <tr>
- <td>Repository URL</td>
- <td>
- <link
href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tages/fop-0_95/";>
-
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code>
- </link>
- </td>
- </tr>
- <tr>
- <td>Web view</td>
- <td>
- <link
href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/";>
-
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/</code>
- </link>
- </td>
- </tr>
- <tr>
<th colspan="2">Trunk</th>
</tr>
<tr>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/faq.xml Sun Oct 21
19:40:19 2012
@@ -145,11 +145,10 @@
<question>When is the next released planned?</question>
<answer>
<p>
- When it's ready and the committers have enough time to go
- through the time-consuming process of creating a release. Version
- 1.1rc1 was released on 02 July 2012. A subsequent final
- Version 1.1 is expected to be released within 1 to 3 months following
- this release candidate. If you want to speed up the process,
consider <link
+ Version 1.1 of FOP was released on 20 October 2012.
+ Work on a new Version 1.2 of Apache FOP is underway at this time,
with
+ no fixed date set for its release.
+ If you want to speed up the process, consider <link
href="dev/index.html#involved">contributing</link> to FOP.
</p>
</answer>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/fo.xml Sun Oct 21
19:40:19 2012
@@ -518,7 +518,7 @@ This applies similarly to the extent of
<section id="external-resources">
<title>External Resources</title>
<p>Resources needed by an XSL-FO file that are external to it
(graphics, for example), are defined in the XSL-FO standard as being of type
"uri-specification". This is defined in the standard at <jump
href="http://www.w3.org/TR/xsl11/#datatype";>Section 5.11 Property
Datatypes</jump>, which includes a link to the URI standard itself. Refer to
the XSL-FO and URI standards themselves for more detailed instructions.</p>
- <p>URIs may be either absolute or relative to a base URI. (See <link
href="1.1rc1/configuration.html">FOP: Configuration</link> for information on
setting the base URI for a FOP session). Here is an example referencing an
external-graphic that is relative to the base URI:</p>
+ <p>URIs may be either absolute or relative to a base URI. (See <link
href="1.1/configuration.html">FOP: Configuration</link> for information on
setting the base URI for a FOP session). Here is an example referencing an
external-graphic that is relative to the base URI:</p>
<source><![CDATA[<fo:external-graphic
src="url('images/logo.jpg')"/>]]></source>
<p>Here is an example referencing an external-graphic that is an
absolute URI on a local filesystem:</p>
<source><![CDATA[fo:external-graphic
src="url('file:///d:/images/logo.jpg')"/>]]></source>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/index.xml Sun Oct 21
19:40:19 2012
@@ -29,7 +29,7 @@
Apache⢠FOP (Formatting Objects Processor) is a print formatter
driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is
a Java
application that reads a formatting object (FO) tree and renders the
resulting
- pages to a specified output. <link href="1.1rc1/output.html">Output
formats</link>
+ pages to a specified output. <link href="1.1/output.html">Output
formats</link>
currently supported include PDF, PS, PCL, AFP, XML (area tree
representation),
Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary
output target is PDF.
</p>
@@ -39,7 +39,7 @@
</p>
<figure width="480" height="260" src="images/document.jpg" alt="Render
Diagram" />
<p>
- A release candidate (rc1) of the latest version of FOP is available at
<link href="1.1rc1/">FOP 1.1rc1</link>.
+ The latest version of FOP is available at <link href="1.1/">FOP
1.1</link>.
</p>
<p>
Support for each of the standard's objects and properties is detailed in
<link href="compliance.html">FOP Compliance</link>.
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/maillist.xml Sun Oct
21 19:40:19 2012
@@ -83,7 +83,7 @@ If you are using Microsoft Outlook, this
source, or other semantic XML? If so, the question is <em>almost
certainly not
appropriate to this list</em>. In general, the only input
documents that are
appropriate on this list are XSL-FO snippets. See <link
- href="1.1rc1/running.html#check-input">Running Xalan</link> for
instructions about capturing the XSL-FO document that is actually submitted to
FOP. If you haven't examined the XSL-FO document yourself, then you are not yet
prepared to formulate a FOP-specific question.</li>
+ href="1.1/running.html#check-input">Running Xalan</link> for
instructions about capturing the XSL-FO document that is actually submitted to
FOP. If you haven't examined the XSL-FO document yourself, then you are not yet
prepared to formulate a FOP-specific question.</li>
<li>If you are providing one or more XSL-FO snippets:
<ul>
<li>Have you reduced them to the shortest possible complete,
<strong>self-contained</strong> document that demonstrates the problem? Please
do so.</li>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/news-data.xml Sun Oct
21 19:40:19 2012
@@ -17,12 +17,10 @@
-->
<!-- $Id$ -->
<news>
- <item date="2012-07-02" title="Apache⢠FOP 1.1rc1 Available">
+ <item date="2012-10-20" title="Apache⢠FOP 1.1 Released">
<p>
- This is a candidate release for an upcoming FOP Version 1.1 (stable)
release.
- release of the new FOP codebase. This release
- contains bug fixes and new features. See
- <a href="1.1rc1/releaseNotes_1.1rc1.html">Release Notes</a> for a list of
+ Apache⢠FOP 1.1 contains bug fixes and a number of new features. See
+ <a href="1.1/releaseNotes_1.1.html">Release Notes</a> for a list of
the most important changes.
</p>
</item>
Modified:
xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/quickstartguide.xml
Sun Oct 21 19:40:19 2012
@@ -29,15 +29,15 @@
<p>The goal of this <strong>Quick Start Guide</strong> is to help novice
users get Apache FOP up and running quickly. Typically, you'll need to:</p>
<ol>
<li><link href="download.html">Download FOP</link></li>
- <li><link href="1.1rc1/compiling.html">Build FOP</link> (you can skip
this step if you download the binary distribution!)</li>
- <li><link href="1.1rc1/configuration.html">Configure FOP</link></li>
- <li><link href="1.1rc1/running.html">Run FOP</link></li>
+ <li><link href="1.1/compiling.html">Build FOP</link> (you can skip
this step if you download the binary distribution!)</li>
+ <li><link href="1.1/configuration.html">Configure FOP</link></li>
+ <li><link href="1.1/running.html">Run FOP</link></li>
</ol>
<p>Here are some links to help you find out what FOP can do, as well as
how and where to get help:</p>
<ul>
- <li><link href="1.1rc1/embedding.html">Calling FOP from a Java
Application</link></li>
- <li><link href="1.1rc1/servlets.html">Using FOP in Servlets</link></li>
- <li><link href="1.1rc1/anttask.html">Using FOP in an 'Ant' Build
Script</link></li>
+ <li><link href="1.1/embedding.html">Calling FOP from a Java
Application</link></li>
+ <li><link href="1.1/servlets.html">Using FOP in Servlets</link></li>
+ <li><link href="1.1/anttask.html">Using FOP in an 'Ant' Build
Script</link></li>
<li><link href="compliance.html" title="FOP Compliance">XSL-FO
Compliance</link> (what FOP supports and what it doesn't)</li>
<li><link href="faq.html">FAQs</link></li>
<li><link href="gethelp.html">Getting Help</link></li>
@@ -45,7 +45,7 @@
</ul>
<p>
Once you've familiarized yourself with the basics, you can get more
detailed information,
- in the detailed FOP <link href="1.1rc1/index.html">product
documentation</link>.
+ in the detailed FOP <link href="1.1/index.html">product
documentation</link>.
</p>
</section>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/site.xml Sun Oct 21
19:40:19 2012
@@ -94,12 +94,12 @@
-->
<!--
- BEGIN Version 1.1rc1 documentation tab
+ BEGIN Version 1.1 documentation tab
-->
- <trunk label="Apache⢠FOP 1.1rc1" href="1.1rc1/" tab="stableversion">
+ <trunk label="Apache⢠FOP 1.1" href="1.1/" tab="stableversion">
<about label="About" href="index.html"/>
- <release label="Release Notes" href="releaseNotes_1.1rc1.html"/>
- <changes label="Changes (1.1rc1)" href="changes_1.1rc1.html"/>
+ <release label="Release Notes" href="releaseNotes_1.1.html"/>
+ <changes label="Changes (1.1)" href="changes_1.1.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
@@ -130,7 +130,7 @@
</trunk>
<!--
- END Version 1.1rc1 documentation tab
+ END Version 1.1 documentation tab
-->
<!--
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/status.xml Sun Oct 21
19:40:19 2012
@@ -27,17 +27,17 @@
<body>
<section>
<title>Status</title>
- <p>Last updated 02 July 2012.</p>
+ <p>Last updated 20 October 2012.</p>
<p>
- Apache⢠FOP version 1.1rc1 (candidate) was released on 02 July 2012.
+ Apache⢠FOP Version 1.1 was released on 20 October 2012.
</p>
</section>
<section>
<title>Development Status</title>
<p>
The FOP code base is gradually evolving, from Version 0.90,
- released on 22 November 2005, to Version 1.1, expected to be released
during
- the Summer of 2012. Further releases in the 1.x series and beyond are
expected.
+ released on 22 November 2005, to Version 1.1, released on
+ 20 October 2012. Further releases in the 1.x series and beyond are
expected.
</p>
<p>
FOP releases prior to version 0.90 were based on a different
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/tabs.xml Sun Oct 21
19:40:19 2012
@@ -22,7 +22,7 @@
<tabs software="FOP" title="FOP" copyright="@year@ The Apache Software
Foundation" xmlns:xlink="http://www.w3.org/1999/xlink";>
<tab label="Home" dir=""/>
<tab label="Version 1.0" dir="1.0/"/>
- <tab label="Version 1.1rc1" dir="1.1rc1/"/>
+ <tab label="Version 1.1" dir="1.1/"/>
<tab label="FOP Trunk" dir="trunk/"/>
<tab label="Development" dir="dev/"/>
</tabs>
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sun Oct 21 19:40:19 2012
@@ -20,7 +20,6 @@
<status>
<developers>
- <!-- In alphabetical order (last name) -->
<person name="Glenn Adams" email="[email protected]" id="GA"/>
<person name="Max Berger" email="[email protected]" id="MB"/>
<person name="Chris Bowditch" email="[email protected]" id="CB"/>
@@ -38,8 +37,6 @@
<person name="Jeremias Märki" email="[email protected]"
id="JM"/>
<person name="Simon Pepping" email="[email protected]" id="SP"/>
<person name="the FOP committers" email="[email protected]"
id="all"/>
- <person name="Volunteer needed" email="[email protected]"
id="open"/>
- <!-- See also src/documentation/content/xdocs/team.xml -->
</developers>
<contexts>
@@ -152,7 +149,7 @@
the restarted Knuth sequence.
</action>
</release>
- <release version="1.1rc1" date="02 July 2012">
+ <release version="1.1" date="20 October 2012">
<action context="Test" dev="GA" type="fix">
Fix errors and warnings in example files. Add build.xml for
documentation examples.
</action>
Modified: xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom?rev=1400707&r1=1400706&r2=1400707&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom (original)
+++ xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom Sun Oct 21 19:40:19
2012
@@ -75,7 +75,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -132,12 +132,12 @@ http://maven.apache.org/xsd/maven-4.0.0.
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
