Revision 1355321

Jump to revision:
Author:	phancock
Date:	Fri Jun 29 11:22:42 2012 UTC (11 years, 11 months ago)
Changed paths:	2345 (showing only 100; show all)
Log Message:	Merged trunk@1354651

Changed paths

Path	Details
xmlgraphics/fop/branches/Temp_RoundedCorners/	modified , props changed
xmlgraphics/fop/branches/Temp_RoundedCorners/KEYS	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/build.properties	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/build.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/checkstyle-4.0.xml	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/checkstyle-5.1.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/checkstyle-5.5.xml (Copied from xmlgraphics/fop/trunk/checkstyle-5.5.xml, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/checkstyle-suppressions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/conf/fop.xconf	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/build.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/ExampleEPS.java (Copied from xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPS.java, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/ExampleEPSSimple.java (Copied from xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPSSimple.java, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/ExampleFO2JPSPrint.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/ExampleJava2D2PDF.java (Copied from xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleJava2D2PDF.java, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/atxml/ExampleConcat.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/advanced/cid-fonts.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/advanced/giro.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/basic/images.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/basic/tableunits.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/build.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/svg/embedding.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/background.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/borders.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/break.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/headfoot.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/keep.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/omit.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/fo/tables/space.fo	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/findbugs-exclude.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/fop	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/fop.bat (Copied from xmlgraphics/fop/trunk/fop.bat, r1355268)	replaced
xmlgraphics/fop/branches/Temp_RoundedCorners/fop.cmd	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/fop.js	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/jacoco.xml (Copied from xmlgraphics/fop/trunk/jacoco.xml, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/asm-commons-3.1.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/asm-util-3.1.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/backport-util-concurrent-3.1.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/backport-util-concurrent.LICENSE.txt	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/hamcrest.core-1.1.0.LICENSE.txt (Copied from xmlgraphics/fop/trunk/lib/build/hamcrest.core-1.1.0.LICENSE.txt, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/hamcrest.core-1.1.0.jar (Copied from xmlgraphics/fop/trunk/lib/build/hamcrest.core-1.1.0.jar, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/mockito-core-1.8.5.LICENCE.txt (Copied from xmlgraphics/fop/trunk/lib/build/mockito-core-1.8.5.LICENCE.txt, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/mockito-core-1.8.5.NOTICE.txt (Copied from xmlgraphics/fop/trunk/lib/build/mockito-core-1.8.5.NOTICE.txt, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/mockito-core-1.8.5.jar (Copied from xmlgraphics/fop/trunk/lib/build/mockito-core-1.8.5.jar, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/objenesis-1.0.0.LICENSE.txt (Copied from xmlgraphics/fop/trunk/lib/build/objenesis-1.0.0.LICENSE.txt, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/objenesis-1.0.0.jar (Copied from xmlgraphics/fop/trunk/lib/build/objenesis-1.0.0.jar, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/qdox-1.12.jar (Copied from xmlgraphics/fop/trunk/lib/build/qdox-1.12.jar, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/qdox-1.6.3.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/retroweaver-2.0.6-patched.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/retroweaver-rt-2.0.6-patched.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/build/retroweaver.LICENSE.txt	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/xmlgraphics-commons-1.4.jar	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/lib/xmlgraphics-commons-1.5svn.jar (Copied from xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/unicode/java/org/apache/fop/complexscripts/ (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts, r1355268)	added
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ (Copied from xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi, r1355268)	replaced
xmlgraphics/fop/branches/Temp_RoundedCorners/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, r1355268)	replaced
xmlgraphics/fop/branches/Temp_RoundedCorners/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, r1355268)	replaced
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/codegen/unicode/java/org/apache/fop/util/License.java	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/favicon.ico	deleted
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/anttask.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/compiling.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/configuration.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/embedding.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/extensions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/fonts.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/graphics.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/hyphenation.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/intermediate.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/knownissues_overview.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/metadata.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/output.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/pdfa.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/pdfencryption.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/pdfx.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/running.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/servlets.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/0.95/upgrading.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/accessibility.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/anttask.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/compiling.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/configuration.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/embedding.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/events.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/extensions.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/fonts.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/graphics.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/hyphenation.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/index.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/intermediate.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/knownissues_overview.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/metadata.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/output.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/pdfa.xml	modified , text changed
xmlgraphics/fop/branches/Temp_RoundedCorners/src/documentation/content/xdocs/1.0/pdfencryption.xml	modified , text changed
[...]