You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2011/01/18 09:54:26 UTC
svn commit: r1060241 [21/21] - in /xmlgraphics/fop/branches/Temp_Color: ./
examples/plan/src/org/apache/fop/plan/ lib/ lib/build/
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/ src/...
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/StandardTestSuite.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/StandardTestSuite.java Tue Jan 18 08:54:08 2011
@@ -23,7 +23,6 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.fop.fonts.DejaVuLGCSerifTest;
-import org.apache.fop.fonts.TrueTypeAnsiTestCase;
import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
import org.apache.fop.intermediate.IFMimickingTestCase;
@@ -54,7 +53,6 @@ public class StandardTestSuite {
suite.addTest(new TestSuite(PDFEncodingTestCase.class));
suite.addTest(new TestSuite(PDFCMapTestCase.class));
suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
- suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
suite.addTest(new TestSuite(DejaVuLGCSerifTest.class));
suite.addTest(RichTextFormatTestSuite.suite());
suite.addTest(new TestSuite(ImageLoaderTestCase.class));
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/URIResolutionTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/URIResolutionTestCase.java Tue Jan 18 08:54:08 2011
@@ -92,7 +92,7 @@ public class URIResolutionTestCase exten
MyURIResolver resolver = new MyURIResolver(withStream);
ua.setURIResolver(resolver);
- ua.setBaseURL(foFile.getParentFile().toURL().toString());
+ ua.setBaseURL(foFile.getParentFile().toURI().toURL().toString());
Document doc = createAreaTree(foFile, ua);
@@ -119,7 +119,7 @@ public class URIResolutionTestCase exten
FOUserAgent ua = fopFactory.newFOUserAgent();
MyURIResolver resolver = new MyURIResolver(false);
ua.setURIResolver(resolver);
- ua.setBaseURL(foFile.getParentFile().toURL().toString());
+ ua.setBaseURL(foFile.getParentFile().toURI().toURL().toString());
ByteArrayOutputStream baout = new ByteArrayOutputStream();
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Tue Jan 18 08:54:08 2011
@@ -100,7 +100,7 @@ public abstract class BaseUserConfigTest
/**
* @return user config File
*/
- abstract protected String getUserConfigFilename();
+ protected abstract String getUserConfigFilename();
/*
* @see junit.framework.TestCase#getName()
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/events/EventChecker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/events/EventChecker.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/events/EventChecker.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/events/EventChecker.java Tue Jan 18 08:54:08 2011
@@ -40,7 +40,7 @@ class EventChecker extends Assert implem
if (event.getEventID().equals(expectedEventID)) {
eventReceived = true;
} else {
- fail("Unexpected event: id = " + event.getEventID() + ": "+ msg);
+ fail("Unexpected event: id = " + event.getEventID() + ": " + msg);
}
}
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java Tue Jan 18 08:54:08 2011
@@ -94,6 +94,6 @@ public abstract class FOTreeUnitTester e
foReader.setErrorHandler(fop.getDefaultHandler());
foReader.setEntityResolver(fop.getDefaultHandler());
- foReader.parse(new File("test/fotree/unittests/" + filename).toURL().toExternalForm());
+ foReader.parse(new File("test/fotree/unittests/" + filename).toURI().toURL().toExternalForm());
}
}
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java Tue Jan 18 08:54:08 2011
@@ -40,7 +40,7 @@ public class TestElementMapping extends
/** @see org.apache.fop.fo.ElementMapping#initialize() */
protected void initialize() {
if (foObjs == null) {
- foObjs = new java.util.HashMap();
+ foObjs = new java.util.HashMap<String, Maker>();
foObjs.put("assert", new AssertMaker());
}
}
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java Tue Jan 18 08:54:08 2011
@@ -116,7 +116,7 @@ public class LayoutEngineTester {
//Setup FOP for area tree rendering
FOUserAgent ua = effFactory.newFOUserAgent();
- ua.setBaseURL(testFile.getParentFile().toURL().toString());
+ ua.setBaseURL(testFile.getParentFile().toURI().toURL().toString());
ua.getEventBroadcaster().addEventListener(
new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/MemoryEater.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/MemoryEater.java Tue Jan 18 08:54:08 2011
@@ -79,7 +79,7 @@ public class MemoryEater {
OutputStream out = new NullOutputStream(); //write to /dev/nul
try {
FOUserAgent userAgent = fopFactory.newFOUserAgent();
- userAgent.setBaseURL(foFile.getParentFile().toURL().toExternalForm());
+ userAgent.setBaseURL(foFile.getParentFile().toURI().toURL().toExternalForm());
Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, out);
Result res = new SAXResult(fop.getDefaultHandler());
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/Stats.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/Stats.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/Stats.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/memory/Stats.java Tue Jan 18 08:54:08 2011
@@ -71,7 +71,7 @@ class Stats {
public void dumpFinalStats() {
long duration = System.currentTimeMillis() - startTime;
System.out.println("Final statistics");
- System.out.println("Pages produced: " +totalPagesProduced);
+ System.out.println("Pages produced: " + totalPagesProduced);
long ppm = 60000 * totalPagesProduced / duration;
System.out.println("Average speed: " + ppm + "ppm");
}
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/RendererFactoryTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/RendererFactoryTest.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/RendererFactoryTest.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/RendererFactoryTest.java Tue Jan 18 08:54:08 2011
@@ -33,7 +33,6 @@ import org.apache.fop.render.intermediat
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFRenderer;
import org.apache.fop.render.pdf.PDFDocumentHandler;
-import org.apache.fop.render.pdf.PDFRenderer;
import org.apache.fop.render.rtf.RTFHandler;
/**
@@ -73,29 +72,15 @@ public class RendererFactoryTest extends
RendererFactory factory = fopFactory.getRendererFactory();
FOUserAgent ua;
Renderer renderer;
- Renderer overrideRenderer;
ua = fopFactory.newFOUserAgent();
renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
assertTrue(renderer instanceof IFRenderer);
- factory.setRendererPreferred(true); //Test legacy setting
- ua = fopFactory.newFOUserAgent();
- renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
- assertTrue(renderer instanceof PDFRenderer);
-
ua = fopFactory.newFOUserAgent();
renderer = factory.createRenderer(ua, MimeConstants.MIME_FOP_IF);
assertTrue(renderer instanceof IFRenderer);
- factory.setRendererPreferred(false);
- ua = fopFactory.newFOUserAgent();
- overrideRenderer = new PDFRenderer();
- overrideRenderer.setUserAgent(ua);
- ua.setRendererOverride(overrideRenderer);
- renderer = factory.createRenderer(ua, null);
- assertTrue(renderer == overrideRenderer);
-
ua = fopFactory.newFOUserAgent();
IFDocumentHandler overrideHandler;
overrideHandler = new PDFDocumentHandler();
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java Tue Jan 18 08:54:08 2011
@@ -27,38 +27,38 @@ import org.apache.fop.pdf.CMapBuilder;
/** Simple sanity test of the PDFCmap class */
public class PDFCMapTestCase extends TestCase {
+ private static final String EOL = "\n";
public void testPDFCMapFillInPDF() throws Exception {
- final String EOL = "\n";
- final String expected =
- "%!PS-Adobe-3.0 Resource-CMap" + EOL
- +"%%DocumentNeededResources: ProcSet (CIDInit)" + EOL
- +"%%IncludeResource: ProcSet (CIDInit)" + EOL
- +"%%BeginResource: CMap (test)" + EOL
- +"%%EndComments" + EOL
- +"/CIDInit /ProcSet findresource begin" + EOL
- +"12 dict begin" + EOL
- +"begincmap" + EOL
- +"/CIDSystemInfo 3 dict dup begin" + EOL
- +" /Registry (Adobe) def" + EOL
- +" /Ordering (Identity) def" + EOL
- +" /Supplement 0 def" + EOL
- +"end def" + EOL
- +"/CMapVersion 1 def" + EOL
- +"/CMapType 1 def" + EOL
- +"/CMapName /test def" + EOL
- +"1 begincodespacerange" + EOL
- +"<0000> <FFFF>" + EOL
- +"endcodespacerange" + EOL
- +"1 begincidrange" + EOL
- +"<0000> <FFFF> 0" + EOL
- +"endcidrange" + EOL
- +"endcmap" + EOL
- +"CMapName currentdict /CMap defineresource pop" + EOL
- +"end" + EOL
- +"end" + EOL
- +"%%EndResource" + EOL
- +"%%EOF" + EOL
+ final String expected
+ = "%!PS-Adobe-3.0 Resource-CMap" + EOL
+ + "%%DocumentNeededResources: ProcSet (CIDInit)" + EOL
+ + "%%IncludeResource: ProcSet (CIDInit)" + EOL
+ + "%%BeginResource: CMap (test)" + EOL
+ + "%%EndComments" + EOL
+ + "/CIDInit /ProcSet findresource begin" + EOL
+ + "12 dict begin" + EOL
+ + "begincmap" + EOL
+ + "/CIDSystemInfo 3 dict dup begin" + EOL
+ + " /Registry (Adobe) def" + EOL
+ + " /Ordering (Identity) def" + EOL
+ + " /Supplement 0 def" + EOL
+ + "end def" + EOL
+ + "/CMapVersion 1 def" + EOL
+ + "/CMapType 1 def" + EOL
+ + "/CMapName /test def" + EOL
+ + "1 begincodespacerange" + EOL
+ + "<0000> <FFFF>" + EOL
+ + "endcodespacerange" + EOL
+ + "1 begincidrange" + EOL
+ + "<0000> <FFFF> 0" + EOL
+ + "endcidrange" + EOL
+ + "endcmap" + EOL
+ + "CMapName currentdict /CMap defineresource pop" + EOL
+ + "end" + EOL
+ + "end" + EOL
+ + "%%EndResource" + EOL
+ + "%%EOF" + EOL
;
final StringWriter w = new StringWriter();
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java Tue Jan 18 08:54:08 2011
@@ -43,52 +43,22 @@ import org.apache.fop.render.intermediat
public class ImageHandlingTestCase extends AbstractPostScriptTestCase {
/**
- * Tests JPEG handling with the {@link PSRenderer}.
+ * Tests JPEG handling.
* @throws Exception if an error occurs
*/
- public void testJPEGImageWithRendererLevel3() throws Exception {
- innerTestJPEGImageWithRenderer(3);
+ public void testJPEGImageLevel3() throws Exception {
+ innerTestJPEGImage(3);
}
/**
- * Tests JPEG handling with the {@link PSRenderer}.
+ * Tests JPEG handling.
* @throws Exception if an error occurs
*/
- public void testJPEGImageWithRendererLevel2() throws Exception {
- innerTestJPEGImageWithRenderer(2);
+ public void testJPEGImageLevel2() throws Exception {
+ innerTestJPEGImage(2);
}
- /**
- * Tests JPEG handling with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testJPEGImageWithIFLevel3() throws Exception {
- innerTestJPEGImageWithIF(3);
- }
-
- /**
- * Tests JPEG handling with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testJPEGImageWithIFLevel2() throws Exception {
- innerTestJPEGImageWithIF(2);
- }
-
- private void innerTestJPEGImageWithRenderer(int level) throws Exception {
- FOUserAgent ua = fopFactory.newFOUserAgent();
- PSRenderer renderer = new PSRenderer();
- renderer.setUserAgent(ua);
- PSRenderingUtil psUtil = renderer.getPSUtil();
- psUtil.setLanguageLevel(level);
- psUtil.setOptimizeResources(true);
- ua.setRendererOverride(renderer);
-
- // Prepare output file
- File outputFile = renderFile(ua, "ps-jpeg-image.fo", "-rend-l" + psUtil.getLanguageLevel());
- verifyPostScriptFile(outputFile, psUtil.getLanguageLevel());
- }
-
- private void innerTestJPEGImageWithIF(int level) throws Exception {
+ private void innerTestJPEGImage(int level) throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
PSDocumentHandler handler = new PSDocumentHandler();
handler.setContext(new IFContext(ua));
@@ -159,10 +129,6 @@ public class ImageHandlingTestCase exten
}
}
- private void assertMatches(String text, String regex) {
- assertTrue("Text didn't match '" + regex + "'", text.matches(regex));
- }
-
private void assertContains(String text, String searchString) {
assertTrue("Text doesn't contain '" + searchString + "'", text.indexOf(searchString) >= 0);
}
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java Tue Jan 18 08:54:08 2011
@@ -54,28 +54,10 @@ import org.apache.fop.render.intermediat
public class ResourceOptimizationTestCase extends AbstractPostScriptTestCase {
/**
- * Tests resource optimization with the {@link PSRenderer}.
+ * Tests resource optimization.
* @throws Exception if an error occurs
*/
- public void testResourceOptimizationWithRenderer() throws Exception {
- FOUserAgent ua = fopFactory.newFOUserAgent();
- PSRenderer renderer = new PSRenderer();
- renderer.setUserAgent(ua);
- // This is the important part: we're enabling resource optimization
- renderer.getPSUtil().setOptimizeResources(true);
- ua.setRendererOverride(renderer);
-
- // Prepare output file
- File outputFile = renderFile(ua, "ps-resources.fo",
- "-rend-l" + renderer.getPSUtil().getLanguageLevel());
- verifyPostScriptFile(outputFile);
- }
-
- /**
- * Tests resource optimization with the {@link PSDocumentHandler}.
- * @throws Exception if an error occurs
- */
- public void testResourceOptimizationWithIF() throws Exception {
+ public void testResourceOptimization() throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
PSDocumentHandler handler = new PSDocumentHandler();
handler.setContext(new IFContext(ua));
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java Tue Jan 18 08:54:08 2011
@@ -320,6 +320,12 @@ public class LineBreakStatusTest extends
"^^^^^^" + "^" + "_^^^^"
));
+ // Unassigned codepoint: should yield same result as AL
+ assertTrue(testBreak(
+ "No" + "\u1F7E" + "break",
+ "^^" + "^" + "^^^^^"
+ ));
+
}
/**
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java Tue Jan 18 08:54:08 2011
@@ -41,6 +41,7 @@ public class LineBreakUtilsTest extends
assertEquals(LineBreakUtils.getLineBreakProperty('\n'), LineBreakUtils.LINE_BREAK_PROPERTY_LF);
assertEquals(LineBreakUtils.getLineBreakProperty('\r'), LineBreakUtils.LINE_BREAK_PROPERTY_CR);
assertEquals(LineBreakUtils.getLineBreakProperty('('), LineBreakUtils.LINE_BREAK_PROPERTY_OP);
+ assertEquals(LineBreakUtils.getLineBreakProperty('\u1F7E'), 0);
}
public void testLineBreakPair() {
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/traits/BorderPropsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/traits/BorderPropsTestCase.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/traits/BorderPropsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/traits/BorderPropsTestCase.java Tue Jan 18 08:54:08 2011
@@ -23,6 +23,7 @@ import java.awt.Color;
import junit.framework.TestCase;
+import org.apache.xmlgraphics.java2d.color.ColorSpaces;
import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
import org.apache.fop.fo.Constants;
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/util/DigestFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/util/DigestFilter.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/util/DigestFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/util/DigestFilter.java Tue Jan 18 08:54:08 2011
@@ -43,7 +43,7 @@ import org.xml.sax.helpers.XMLFilterImpl
public class DigestFilter extends XMLFilterImpl {
private MessageDigest digest;
- private byte value[];
+ private byte[] value;
private boolean isNamespaceAware;
public DigestFilter(String algorithm) throws NoSuchAlgorithmException {
@@ -133,7 +133,7 @@ public class DigestFilter extends XMLFil
*/
public void setFeature(String feature, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException {
- if(feature.equals("http://xml.org/sax/features/namespaces")) {
+ if (feature.equals("http://xml.org/sax/features/namespaces")) {
isNamespaceAware = value;
}
super.setFeature(feature, value);
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java Tue Jan 18 08:54:08 2011
@@ -122,7 +122,7 @@ public abstract class AbstractPSPDFBitma
try {
FOUserAgent userAgent = fopFactory.newFOUserAgent();
userAgent.setTargetResolution(context.getTargetResolution());
- userAgent.setBaseURL(src.getParentFile().toURL().toString());
+ userAgent.setBaseURL(src.getParentFile().toURI().toURL().toString());
File tempOut = new File(context.getTargetDir(),
src.getName() + "." + index + "." + getTargetExtension());
Modified: xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/BitmapProducerJava2D.java?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/BitmapProducerJava2D.java (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/java/org/apache/fop/visual/BitmapProducerJava2D.java Tue Jan 18 08:54:08 2011
@@ -70,7 +70,7 @@ public class BitmapProducerJava2D extend
try {
FOUserAgent userAgent = fopFactory.newFOUserAgent();
userAgent.setTargetResolution(context.getTargetResolution());
- userAgent.setBaseURL(src.getParentFile().toURL().toString());
+ userAgent.setBaseURL(src.getParentFile().toURI().toURL().toString());
File outputFile = new File(context.getTargetDir(),
src.getName() + "." + index + ".java2d.png");
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/disabled-testcases.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/disabled-testcases.xml Tue Jan 18 08:54:08 2011
@@ -39,12 +39,6 @@
<description>Font-stretch is not implemented, yet.</description>
</testcase>
<testcase>
- <name>Hyphenation with preserved linefeeds</name>
- <file>block_hyphenation_linefeed_preserve.xml</file>
- <description>When hyphenation is enabled and linefeeds are preserved,
- the text is output multiple times.</description>
- </testcase>
- <testcase>
<name>linefeed-treatment</name>
<file>block_linefeed-treatment.xml</file>
<description>Preserved linefeeds in a fo:character are not handled
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml Tue Jan 18 08:54:08 2011
@@ -19,7 +19,11 @@
<testcase>
<info>
<p>
- Check for bug: Duplicate content and linefeeds as "#".
+ Check for bug 38264:
+ <ul>
+ <li>duplication of content with linefeed-treatment="preserve" and hyphenate="true"</li>
+ <li>missing hyphens with white-space-treatment="preserve" and hyphenate="true"</li>
+ </ul>
</p>
</info>
<fo>
@@ -31,21 +35,39 @@
</fo:layout-master-set>
<fo:page-sequence master-reference="simple">
<fo:flow flow-name="xsl-region-body">
- <fo:block line-height="10pt" background-color="orange"
- white-space-collapse="false" white-space-treatment="preserve" linefeed-treatment="preserve">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas semper. Proin at.</fo:block>
- <fo:block line-height="10pt" background-color="orange"
- white-space-collapse="false" white-space-treatment="preserve" linefeed-treatment="preserve">
+ <fo:block white-space-collapse="false" white-space-treatment="preserve" linefeed-treatment="preserve">
line1
line2
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas semper. Proin at1.
-</fo:block>
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas semper. Proin at.
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
- <!-- Dummy check. We don't want an NPE. -->
- <eval expected="2" xpath="count(//*[contains(text(), 'adipiscing')])"/>
+ <!-- check number of lines and word fragments -->
+ <eval expected="13" xpath="count(//flow[1]/block/lineArea)" />
+ <eval expected="17" xpath="count(//flow[1]/block/lineArea/text/word)" />
+ <!-- check individual word fragments -->
+ <eval expected="line1" xpath="(//flow[1]/block/lineArea/text/word)[1]" />
+ <eval expected="line2" xpath="(//flow[1]/block/lineArea/text/word)[2]" />
+ <eval expected="Lorem" xpath="(//flow[1]/block/lineArea/text/word)[3]" />
+ <eval expected="ip-" xpath="(//flow[1]/block/lineArea/text/word)[4]" />
+ <eval expected="sum" xpath="(//flow[1]/block/lineArea/text/word)[5]" />
+ <eval expected="dolor" xpath="(//flow[1]/block/lineArea/text/word)[6]" />
+ <eval expected="sit" xpath="(//flow[1]/block/lineArea/text/word)[7]" />
+ <eval expected="amet," xpath="(//flow[1]/block/lineArea/text/word)[8]" />
+ <eval expected="con-" xpath="(//flow[1]/block/lineArea/text/word)[9]" />
+ <eval expected="sectetuer" xpath="(//flow[1]/block/lineArea/text/word)[10]" />
+ <eval expected="adipiscing" xpath="(//flow[1]/block/lineArea/text/word)[11]" />
+ <eval expected="elit." xpath="(//flow[1]/block/lineArea/text/word)[12]" />
+ <eval expected="Maece-" xpath="(//flow[1]/block/lineArea/text/word)[13]" />
+ <eval expected="nas" xpath="(//flow[1]/block/lineArea/text/word)[14]" />
+ <eval expected="semper." xpath="(//flow[1]/block/lineArea/text/word)[15]" />
+ <eval expected="Proin" xpath="(//flow[1]/block/lineArea/text/word)[16]" />
+ <eval expected="at." xpath="(//flow[1]/block/lineArea/text/word)[17]" />
+ <!-- check preservation of spaces on the last line -->
+ <eval expected="10" xpath="count((//flow[1]/block/lineArea)[13]/text/space)" />
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml Tue Jan 18 08:54:08 2011
@@ -56,13 +56,19 @@
<fo:table table-layout="fixed" width="100%">
<fo:table-body>
<fo:table-row>
- <fo:table-cell>
- <fo:block>After the table 1</fo:block>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1.2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
- <fo:block>After the table 2</fo:block>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
@@ -74,7 +80,12 @@
<checks>
<eval expected="Block before the page break." xpath="//pageViewport[1]//flow/block[2]//text"/>
<eval expected="Block after the page break." xpath="//pageViewport[2]//flow/block[1]//text"/>
- <eval expected="After the table 1" xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
- <eval expected="After the table 2" xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+ <eval expected="400000" xpath="//pageViewport[2]//flow/block[2]/@ipd"/>
+ <eval expected="199000" xpath="//pageViewport[2]//flow/block[2]/block[1]/@ipd"/>
+ <eval expected="Cell 1.1" xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
+ <eval expected="199000" xpath="//pageViewport[2]//flow/block[2]/block[2]/@ipd"/>
+ <eval expected="Cell 1.2" xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+ <eval expected="Cell 2.1" xpath="//pageViewport[2]//flow/block[2]/block[3]//text"/>
+ <eval expected="Cell 2.2" xpath="//pageViewport[2]//flow/block[2]/block[4]//text"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_keep-together.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_keep-together.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_keep-together.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_keep-together.xml Tue Jan 18 08:54:08 2011
@@ -38,6 +38,22 @@
<fo:block keep-together.within-line="always">This is Blah blah blah blah!</fo:block>
<fo:block>This is <fo:inline keep-together.within-line="always">Blah blah blah blah!</fo:inline></fo:block>
<fo:block>This is <fo:wrapper keep-together.within-line="always">Blah blah blah blah!</fo:wrapper></fo:block>
+ <fo:block>
+ <fo:inline keep-together.within-line="always">
+ This<fo:inline> entire</fo:inline> sentence
+ <fo:inline>should be </fo:inline>kept
+ <fo:inline>together
+ <fo:inline>on
+ <fo:inline>one
+ <fo:inline>very,
+ <fo:inline>very,</fo:inline>
+ <fo:inline>very,</fo:inline>
+ <fo:inline>very,</fo:inline>
+ <fo:inline>long</fo:inline>
+ </fo:inline></fo:inline></fo:inline>line
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
</fo:block-container>
</fo:flow>
</fo:page-sequence>
@@ -54,6 +70,9 @@
<!-- The layout engine should warn the user about the overflow in this case. -->
<eval expected="This is" xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>
<eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>
+
+ <!-- check effect of nested inlines (see Bugzilla #49848) -->
+ <eval expected="1" xpath="count(//flow/block[1]/block[1]/block[4]/lineArea)" />
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml Tue Jan 18 08:54:08 2011
@@ -48,7 +48,7 @@
</fo:root>
</fo>
<checks>
- <eval expected="105384"
+ <eval expected="117384"
xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@ipd" desc="IPD of
containing inline area"/>
<eval expected="73368"
Modified: xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml Tue Jan 18 08:54:08 2011
@@ -28,7 +28,7 @@
</p>
</info>
<fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" id="root">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"
margin="20pt">
@@ -79,6 +79,7 @@
</fo:page-sequence>
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body" font-size="8pt">
+ <fo:block>root= <fo:page-number-citation-last ref-id="root"/></fo:block>
<fo:block>page-sequence= <fo:page-number-citation-last ref-id="page-sequence1"/></fo:block>
<fo:block>block= <fo:page-number-citation-last ref-id="block1"/></fo:block>
<fo:block>list= <fo:page-number-citation-last ref-id="list1"/></fo:block>
@@ -97,18 +98,19 @@
</fo:root>
</fo>
<checks>
- <true fail-msg="no ID for page-sequence" xpath="'page-sequence= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
- <true fail-msg="no ID for block" xpath="'block= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
- <true fail-msg="no ID for list-block" xpath="'list= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
- <true fail-msg="no ID for list-item" xpath="'item= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
- <true fail-msg="no ID for list-item-label" xpath="'item-label= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
- <true fail-msg="no ID for list-item-body" xpath="'item-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
- <true fail-msg="no ID for table" xpath="'table= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
- <!-- <true fail-msg="no ID for table-header" xpath="'table-header= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
- <true fail-msg="no ID for table-footer" xpath="'table-footer= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
- <true fail-msg="no ID for table-body" xpath="'table-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
- <true fail-msg="no ID for table-row" xpath="'table-row= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>-->
- <true fail-msg="no ID for table-cell" xpath="'table-cell= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[12]"/>
- <true fail-msg="no ID for block-container" xpath="'block-container= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[13]"/>
+ <true fail-msg="no ID for root" xpath="'root= 2' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
+ <true fail-msg="no ID for page-sequence" xpath="'page-sequence= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
+ <true fail-msg="no ID for block" xpath="'block= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
+ <true fail-msg="no ID for list-block" xpath="'list= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
+ <true fail-msg="no ID for list-item" xpath="'item= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
+ <true fail-msg="no ID for list-item-label" xpath="'item-label= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
+ <true fail-msg="no ID for list-item-body" xpath="'item-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
+ <true fail-msg="no ID for table" xpath="'table= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
+ <!-- <true fail-msg="no ID for table-header" xpath="'table-header= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
+ <true fail-msg="no ID for table-footer" xpath="'table-footer= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
+ <true fail-msg="no ID for table-body" xpath="'table-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>
+ <true fail-msg="no ID for table-row" xpath="'table-row= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[12]"/>-->
+ <true fail-msg="no ID for table-cell" xpath="'table-cell= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[13]"/>
+ <true fail-msg="no ID for block-container" xpath="'block-container= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[14]"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_Color/test/test-no-xml-metrics.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/test/test-no-xml-metrics.xconf?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/test/test-no-xml-metrics.xconf (original)
+++ xmlgraphics/fop/branches/Temp_Color/test/test-no-xml-metrics.xconf Tue Jan 18 08:54:08 2011
@@ -7,7 +7,7 @@
<base>./</base>
<!-- Font Base URL for resolving relative font URLs -->
- <font-base>./test/resources/fonts</font-base>
+ <font-base>./resources/fonts</font-base>
<renderers>
<renderer mime="application/pdf">
Modified: xmlgraphics/fop/branches/Temp_Color/xmlgraphics-fop-pom-template.pom
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Color/xmlgraphics-fop-pom-template.pom?rev=1060241&r1=1060240&r2=1060241&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Color/xmlgraphics-fop-pom-template.pom (original)
+++ xmlgraphics/fop/branches/Temp_Color/xmlgraphics-fop-pom-template.pom Tue Jan 18 08:54:08 2011
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-http://maven.apache.org/maven-v4_0_0.xsd">
+http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
@@ -59,18 +59,23 @@ http://maven.apache.org/maven-v4_0_0.xsd
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
<dependencies>
<!-- XML Graphics -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org