Author: vhennebert
Date: Wed Aug 26 17:50:40 2009
New Revision: 808137
URL: http://svn.apache.org/viewvc?rev=808137&view=rev
Log:
Blocked revision 808135 from Trunk
Modified:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/ (props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/java/embedding/atxml/ExampleConcat.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/java/embedding/atxml/ExampleStamp.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/xml/xslt/ifstamp.xsl
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
(props changed)
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/IFParserTestCase.java
(props changed)
Propchange: xmlgraphics/fop/branches/Temp_ChangingIPDHack/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/trunk:784730-808112
+/xmlgraphics/fop/trunk:784730-808112,808135
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/java/embedding/atxml/ExampleConcat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,5 +1,5 @@
/xmlgraphics/fop/branches/Temp_AFPGOCAResources/examples/embedding/java/embedding/intermediate/ExampleConcat.java:630874-721418
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleConcat.java:603620-746655
/xmlgraphics/fop/branches/fop-0_95/examples/embedding/java/embedding/intermediate/ExampleConcat.java:684572,688085,688696
-/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java:784730-808112
+/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java:784730-808112,808135
/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java:603620-741103
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/java/embedding/atxml/ExampleStamp.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,5 +1,5 @@
/xmlgraphics/fop/branches/Temp_AFPGOCAResources/examples/embedding/java/embedding/intermediate/ExampleStamp.java:630874-721418
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleStamp.java:603620-746655
/xmlgraphics/fop/branches/fop-0_95/examples/embedding/java/embedding/intermediate/ExampleStamp.java:684572,688085,688696
-/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java:784730-808112
+/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java:784730-808112,808135
/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java:603620-741103
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/examples/embedding/xml/xslt/ifstamp.xsl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -2,4 +2,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/xml/xslt/ifstamp.xsl:603620-746655
/xmlgraphics/fop/branches/fop-0_95/examples/embedding/xml/xslt/atstamp.xsl:684572,688085,688696
/xmlgraphics/fop/trunk/examples/embedding/xml/xslt/atstamp.xsl:603620-741103
-/xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl:784730-808112
+/xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl:784730-808112,808135
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:784730-808112
+/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:784730-808112,808135
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFPainter:684572
-/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:784730-808112,808135
/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFPainter:603620-685574
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:784730-808112,808135
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:784730-808112,808135
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPainterMaker.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java:784730-808112,808135
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainterMaker.java:603620-685574
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPrintPainter.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java:784730-808112,808135
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintPainter.java:603620-685574
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/fop-0_95/src/sandbox/org/apache/fop/render/svg/SVGPrintPainterMaker.java:684572
-/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java:784730-808112
+/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java:784730-808112,808135
/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintPainterMaker.java:603620-685574
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:603620-746655
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:784730-808112
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java:784730-808112,808135
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:603620-677588
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:603620-746655
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:784730-808112
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java:784730-808112,808135
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java:603620-677588
Propchange:
xmlgraphics/fop/branches/Temp_ChangingIPDHack/test/java/org/apache/fop/intermediate/IFParserTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 17:50:40 2009
@@ -1,3 +1,3 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/IFParserTestCase.java:603620-746655
/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:603620-677588
-/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java:784730-808112
+/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java:784730-808112,808135
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
