Revision 1343285

Jump to revision:
Author:	phancock
Date:	Mon May 28 15:30:46 2012 UTC (11 years, 11 months ago)
Changed paths:	1720 (showing only 100; show all)
Log Message:	Merged trunk@1343133

Changed paths

Path	Details
xmlgraphics/fop/branches/Temp_URI_Unification/	modified , props changed
xmlgraphics/fop/branches/Temp_URI_Unification/KEYS	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/build.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/checkstyle-4.0.xml	deleted
xmlgraphics/fop/branches/Temp_URI_Unification/checkstyle-5.5.xml (Copied from xmlgraphics/fop/trunk/checkstyle-5.5.xml, r1343274)	added
xmlgraphics/fop/branches/Temp_URI_Unification/checkstyle-suppressions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/conf/fop.xconf	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/examples/embedding/build.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/examples/embedding/java/embedding/ExampleEPS.java (Copied from xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPS.java, r1343274)	added
xmlgraphics/fop/branches/Temp_URI_Unification/examples/embedding/java/embedding/ExampleEPSSimple.java (Copied from xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPSSimple.java, r1343274)	added
xmlgraphics/fop/branches/Temp_URI_Unification/examples/embedding/java/embedding/ExampleJava2D2PDF.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/findbugs-exclude.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/fop	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/fop.bat	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/fop.cmd	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/fop.js	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/jacoco.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/lib/xmlgraphics-commons-1.5svn.jar	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/complexscripts/ (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts, r1343274)	added
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi, r1343274)	replaced
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java, r1343274)	replaced
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java, r1343274)	replaced
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/anttask.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/compiling.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/configuration.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/embedding.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/extensions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/fonts.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/graphics.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/hyphenation.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/intermediate.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/knownissues_overview.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/metadata.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/output.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/pdfa.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/pdfencryption.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/pdfx.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/running.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/servlets.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/0.95/upgrading.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/accessibility.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/anttask.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/compiling.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/configuration.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/embedding.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/events.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/extensions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/fonts.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/graphics.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/hyphenation.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/intermediate.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/knownissues_overview.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/metadata.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/output.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/pdfa.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/pdfencryption.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/pdfx.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/running.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/servlets.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/1.0/upgrading.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/bugs.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/compliance.ihtml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/conventions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/areas.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/breakpos.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/configuration.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/embedding.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/extending.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/fotree.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/images.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/layout.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/optimise.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/parsing.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/pdf-library.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/properties.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/renderers.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/startup.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/svg.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/design/useragent.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/doc.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/extensions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/faq.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/fonts.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/implement.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/release.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/rtflib.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/svg.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/testing.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/dev/tools.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/download.xml	modified , text changed
xmlgraphics/fop/branches/Temp_URI_Unification/src/documentation/content/xdocs/examples.xml	modified , text changed
[...]