Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java Thu Sep 29 09:49:24 2011 @@ -81,7 +81,7 @@ public class PDFRendererConfigurator ext Configuration encryptionParamsConfig = cfg.getChild(PDFConfigurationConstants.ENCRYPTION_PARAMS, false); if (encryptionParamsConfig != null) { - PDFEncryptionParams encryptionParams = new PDFEncryptionParams(); + PDFEncryptionParams encryptionParams = pdfUtil.getEncryptionParams(); Configuration ownerPasswordConfig = encryptionParamsConfig.getChild( PDFConfigurationConstants.OWNER_PASSWORD, false); if (ownerPasswordConfig != null) { @@ -118,8 +118,35 @@ public class PDFRendererConfigurator ext if (noAnnotationsConfig != null) { encryptionParams.setAllowEditAnnotations(false); } - pdfUtil.setEncryptionParams(encryptionParams); + Configuration noFillInForms = encryptionParamsConfig.getChild( + PDFConfigurationConstants.NO_FILLINFORMS, false); + if (noFillInForms != null) { + encryptionParams.setAllowFillInForms(false); + } + Configuration noAccessContentConfig = encryptionParamsConfig.getChild( + PDFConfigurationConstants.NO_ACCESSCONTENT, false); + if (noAccessContentConfig != null) { + encryptionParams.setAllowAccessContent(false); + } + Configuration noAssembleDocConfig = encryptionParamsConfig.getChild( + PDFConfigurationConstants.NO_ASSEMBLEDOC, false); + if (noAssembleDocConfig != null) { + encryptionParams.setAllowAssembleDocument(false); + } + Configuration noPrintHqConfig = encryptionParamsConfig.getChild( + PDFConfigurationConstants.NO_PRINTHQ, false); + if (noPrintHqConfig != null) { + encryptionParams.setAllowPrintHq(false); + } + Configuration encryptionLengthConfig = encryptionParamsConfig.getChild( + PDFConfigurationConstants.ENCRYPTION_LENGTH, false); + if (encryptionLengthConfig != null) { + int encryptionLength = checkEncryptionLength( + Integer.parseInt(encryptionLengthConfig.getValue(null))); + encryptionParams.setEncryptionLengthInBits(encryptionLength); + } } + s = cfg.getChild(PDFConfigurationConstants.KEY_OUTPUT_PROFILE, true).getValue(null); if (s != null) { pdfUtil.setOutputProfileURI(s); @@ -132,6 +159,22 @@ public class PDFRendererConfigurator ext } } + private int checkEncryptionLength(int encryptionLength) { + int correctEncryptionLength = encryptionLength; + if (encryptionLength < 40) { + correctEncryptionLength = 40; + } else if (encryptionLength > 128) { + correctEncryptionLength = 128; + } else if (encryptionLength % 8 != 0) { + correctEncryptionLength = ((int) Math.round(encryptionLength / 8.0f)) * 8; + } + if (correctEncryptionLength != encryptionLength) { + PDFEventProducer.Provider.get(userAgent.getEventBroadcaster()) + .incorrectEncryptionLength(this, encryptionLength, correctEncryptionLength); + } + return correctEncryptionLength; + } + /** * Builds a filter map from an Avalon Configuration object. *
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java Thu Sep 29 09:49:24 2011 @@ -124,49 +124,45 @@ class PDFRenderingUtil implements PDFCon if (params != null) { this.encryptionParams = params; //overwrite if available } - String pwd; - pwd = (String)userAgent.getRendererOptions().get(USER_PASSWORD); - if (pwd != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setUserPassword(pwd); - } - pwd = (String)userAgent.getRendererOptions().get(OWNER_PASSWORD); - if (pwd != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setOwnerPassword(pwd); - } - Object setting; - setting = userAgent.getRendererOptions().get(NO_PRINT); - if (setting != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setAllowPrint(!booleanValueOf(setting)); - } - setting = userAgent.getRendererOptions().get(NO_COPY_CONTENT); - if (setting != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setAllowCopyContent(!booleanValueOf(setting)); - } - setting = userAgent.getRendererOptions().get(NO_EDIT_CONTENT); - if (setting != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setAllowEditContent(!booleanValueOf(setting)); - } - setting = userAgent.getRendererOptions().get(NO_ANNOTATIONS); - if (setting != null) { - if (encryptionParams == null) { - this.encryptionParams = new PDFEncryptionParams(); - } - this.encryptionParams.setAllowEditAnnotations(!booleanValueOf(setting)); + String userPassword = (String)userAgent.getRendererOptions().get(USER_PASSWORD); + if (userPassword != null) { + getEncryptionParams().setUserPassword(userPassword); + } + String ownerPassword = (String)userAgent.getRendererOptions().get(OWNER_PASSWORD); + if (ownerPassword != null) { + getEncryptionParams().setOwnerPassword(ownerPassword); + } + Object noPrint = userAgent.getRendererOptions().get(NO_PRINT); + if (noPrint != null) { + getEncryptionParams().setAllowPrint(!booleanValueOf(noPrint)); + } + Object noCopyContent = userAgent.getRendererOptions().get(NO_COPY_CONTENT); + if (noCopyContent != null) { + getEncryptionParams().setAllowCopyContent(!booleanValueOf(noCopyContent)); + } + Object noEditContent = userAgent.getRendererOptions().get(NO_EDIT_CONTENT); + if (noEditContent != null) { + getEncryptionParams().setAllowEditContent(!booleanValueOf(noEditContent)); + } + Object noAnnotations = userAgent.getRendererOptions().get(NO_ANNOTATIONS); + if (noAnnotations != null) { + getEncryptionParams().setAllowEditAnnotations(!booleanValueOf(noAnnotations)); + } + Object noFillInForms = userAgent.getRendererOptions().get(NO_FILLINFORMS); + if (noFillInForms != null) { + getEncryptionParams().setAllowFillInForms(!booleanValueOf(noFillInForms)); + } + Object noAccessContent = userAgent.getRendererOptions().get(NO_ACCESSCONTENT); + if (noAccessContent != null) { + getEncryptionParams().setAllowAccessContent(!booleanValueOf(noAccessContent)); + } + Object noAssembleDoc = userAgent.getRendererOptions().get(NO_ASSEMBLEDOC); + if (noAssembleDoc != null) { + getEncryptionParams().setAllowAssembleDocument(!booleanValueOf(noAssembleDoc)); + } + Object noPrintHQ = userAgent.getRendererOptions().get(NO_PRINTHQ); + if (noPrintHQ != null) { + getEncryptionParams().setAllowPrintHq(!booleanValueOf(noPrintHQ)); } String s = (String)userAgent.getRendererOptions().get(PDF_A_MODE); if (s != null) { @@ -184,9 +180,10 @@ class PDFRenderingUtil implements PDFCon if (s != null) { this.outputProfileURI = s; } - setting = userAgent.getRendererOptions().get(KEY_DISABLE_SRGB_COLORSPACE); - if (setting != null) { - this.disableSRGBColorSpace = booleanValueOf(setting); + Object disableSRGBColorSpace = userAgent.getRendererOptions().get( + KEY_DISABLE_SRGB_COLORSPACE); + if (disableSRGBColorSpace != null) { + this.disableSRGBColorSpace = booleanValueOf(disableSRGBColorSpace); } } @@ -236,11 +233,14 @@ class PDFRenderingUtil implements PDFCon } /** - * Sets the encryption parameters used by the PDF renderer. - * @param encryptionParams the encryption parameters + * Gets the encryption parameters used by the PDF renderer. + * @return encryptionParams the encryption parameters */ - public void setEncryptionParams(PDFEncryptionParams encryptionParams) { - this.encryptionParams = encryptionParams; + PDFEncryptionParams getEncryptionParams() { + if (this.encryptionParams == null) { + this.encryptionParams = new PDFEncryptionParams(); + } + return this.encryptionParams; } private void updateInfo() { Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java Thu Sep 29 09:49:24 2011 @@ -26,6 +26,7 @@ import java.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; +import org.apache.fop.render.RenderingContext; import org.apache.xmlgraphics.image.loader.Image; import org.apache.xmlgraphics.image.loader.ImageFlavor; import org.apache.xmlgraphics.image.loader.ImageInfo; @@ -36,8 +37,6 @@ import org.apache.xmlgraphics.ps.FormGen import org.apache.xmlgraphics.ps.PSGenerator; import org.apache.xmlgraphics.ps.PSProcSets; -import org.apache.fop.render.RenderingContext; - /** * Image handler implementation which handles vector graphics (Java2D) for PostScript output. */ @@ -97,34 +96,14 @@ public class PSImageHandlerGraphics2D im } /** {@inheritDoc} */ - public void generateForm(RenderingContext context, Image image, PSImageFormResource form) + public void generateForm(RenderingContext context, Image image, final PSImageFormResource form) throws IOException { PSRenderingContext psContext = (PSRenderingContext)context; PSGenerator gen = psContext.getGenerator(); final ImageGraphics2D imageG2D = (ImageGraphics2D)image; ImageInfo info = image.getInfo(); - String imageDescription = info.getMimeType() + " " + info.getOriginalURI(); - final Dimension2D dimensionsPt = info.getSize().getDimensionPt(); - final Dimension2D dimensionsMpt = info.getSize().getDimensionMpt(); - - FormGenerator formGen = new FormGenerator( - form.getName(), imageDescription, dimensionsPt) { - protected void generatePaintProc(PSGenerator gen) - throws IOException { - gen.getResourceTracker().notifyResourceUsageOnPage( - PSProcSets.EPS_PROCSET); - gen.writeln("BeginEPSF"); - PSGraphics2DAdapter adapter = new PSGraphics2DAdapter(gen, false); - adapter.paintImage(imageG2D.getGraphics2DImagePainter(), - null, - 0, 0, - (int)Math.round(dimensionsMpt.getWidth()), - (int)Math.round(dimensionsMpt.getHeight())); - gen.writeln("EndEPSF"); - } - - }; + FormGenerator formGen = buildFormGenerator(gen.getPSLevel(), form, info, imageG2D); formGen.generate(gen); } /** {@inheritDoc} */ @@ -150,4 +129,70 @@ public class PSImageHandlerGraphics2D im return false; } + private FormGenerator buildFormGenerator(int psLanguageLevel, final PSImageFormResource form, + final ImageInfo info, final ImageGraphics2D imageG2D) { + String imageDescription = info.getMimeType() + " " + info.getOriginalURI(); + final Dimension2D dimensionsPt = info.getSize().getDimensionPt(); + final Dimension2D dimensionsMpt = info.getSize().getDimensionMpt(); + FormGenerator formGen; + + if (psLanguageLevel <= 2) { + formGen = new EPSFormGenerator(form.getName(), imageDescription, dimensionsPt) { + + @Override + void doGeneratePaintProc(PSGenerator gen) throws IOException { + paintImageG2D(imageG2D, dimensionsMpt, gen); + } + }; + } else { + formGen = new EPSFormGenerator(form.getName(), imageDescription, dimensionsPt) { + + @Override + protected void generateAdditionalDataStream(PSGenerator gen) throws IOException { + gen.writeln("/" + form.getName() + ":Data currentfile <<"); + gen.writeln(" /Filter /SubFileDecode"); + gen.writeln(" /DecodeParms << /EODCount 0 /EODString (%FOPEndOfData) >>"); + gen.writeln(">> /ReusableStreamDecode filter"); + paintImageG2D(imageG2D, dimensionsMpt, gen); + gen.writeln("%FOPEndOfData"); + gen.writeln("def"); + } + + @Override + void doGeneratePaintProc(PSGenerator gen) throws IOException { + gen.writeln(form.getName() + ":Data 0 setfileposition"); + gen.writeln(form.getName() + ":Data cvx exec"); + } + }; + } + return formGen; + } + + private abstract static class EPSFormGenerator extends FormGenerator { + + EPSFormGenerator(String formName, String title, Dimension2D dimensions) { + super(formName, title, dimensions); + } + + protected void paintImageG2D(final ImageGraphics2D imageG2D, Dimension2D dimensionsMpt, + PSGenerator gen) throws IOException { + PSGraphics2DAdapter adapter = new PSGraphics2DAdapter(gen, false); + adapter.paintImage(imageG2D.getGraphics2DImagePainter(), + null, + 0, 0, + (int) Math.round(dimensionsMpt.getWidth()), + (int) Math.round(dimensionsMpt.getHeight())); + } + + @Override + protected final void generatePaintProc(PSGenerator gen) throws IOException { + gen.getResourceTracker().notifyResourceUsageOnPage( + PSProcSets.EPS_PROCSET); + gen.writeln("BeginEPSF"); + doGeneratePaintProc(gen); + gen.writeln("EndEPSF"); + } + + abstract void doGeneratePaintProc(PSGenerator gen) throws IOException; + } } Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java Thu Sep 29 09:49:24 2011 @@ -132,12 +132,6 @@ import org.apache.fop.render.rtf.rtflib. /** * RTF Handler: generates RTF output using the structure events from * the FO Tree sent to this structure handler. - * - * @author Bertrand Delacretaz <[email protected]> - * @author Trembicki-Guy, Ed <[email protected]> - * @author Boris Poudérous <[email protected]> - * @author Peter Herweg <[email protected]> - * @author Andreas Putz <[email protected]> */ public class RTFHandler extends FOEventHandler { Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Thu Sep 29 09:49:24 2011 @@ -269,7 +269,6 @@ public abstract class AbstractFOPTransco } public Source resolveURI(String uri) { - System.out.println("resolve " + uri); try { ParsedURL url = new ParsedURL(baseURI, uri); InputStream in = url.openStream(); Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 29 09:49:24 2011 @@ -3,4 +3,4 @@ /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorExt.java:603620-746655 /xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/util/ColorExt.java:956535-1069429 /xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/util/ColorExt.java:684572,688085,688696 -/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1149493 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1177230 Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml Thu Sep 29 09:49:24 2011 @@ -60,6 +60,43 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> <release version="FOP Trunk" date="TBD"> + <action context="Fonts" dev="PH" type="fix" fixes-bug="48696"> + Bugfix for color model in IOCA IDE structure parameter for 4- and 8-bit grayscale images. + Revision 4. + </action> + <action context="Fonts" dev="PH" type="fix" fixes-bug="51760" due-to="Mehdi Houshmand"> + Changes the way PostScript handles Graphics2D images such that if the language is set to + level 3, the image is stored as an embedded file which has no length limit. Previously it + was stored as an array which has a implementation limit of 65535 elements. + </action> + <action context="Fonts" dev="PH" type="fix" fixes-bug="51759" due-to="Mehdi Houshmand"> + PDFFactory responsible for asdigning name to a subset font. + </action> + <action context="Fonts" dev="PH" type="fix" fixes-bug="51530" due-to="Mehdi Houshmand"> + Improved support for EBCDIC encoded double byte fonts fo AFP. + </action> + <action context="Fonts" dev="PH" type="fix" fixes-bug="51205" due-to="Mehdi Houshmand"> + Corrected typographical errors in AFPBase12FontCollection. + </action> + <action context="Renderers" dev="PH" type="fix" fixes-bug="48062"> + Improved fix of a bug relating to PCL painter thread safetly. Previous fix in rev 895012 + worked by synchronizing methods of a static instance of Java2DFontMetrics. This fix uses a + unique instance for per thread. + </action> + <action context="Renderers" dev="PH" type="fix"> + Fixed a bug in AFP where an ArrayOutofBoundsException is throwqn when embedding a Page + Segment. + </action> + <action context="Renderers" dev="VH" type="add"> + Added support for 128bit encryption in PDF output. Based on work by Michael Rubin. + </action> + <action context="Renderers" dev="PH" type="fix"> + Fixed a bug in AFP where the object area axes of an Include Object was incorrectly set when + rotated by 180. </action> + <action context="Fonts" dev="JM" type="fix" fixes-bug="51596" due-to="Mehdi Houshmand"> + Fixed a bug in TTF subsetting where a composite glyph could get + remapped more than once resulting in garbled character. + </action> <action context="Fonts" dev="JM" type="fix" fixes-bug="50605"> Fixed a number of bugs concerning Type 1 and other single-byte fonts (glyph width mismatches and overlapping characters). Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/StandardTestSuite.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/StandardTestSuite.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/StandardTestSuite.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/StandardTestSuite.java Thu Sep 29 09:49:24 2011 @@ -22,13 +22,14 @@ package org.apache.fop; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.fop.area.ViewportTestSuite; +import org.apache.fop.afp.fonts.CharactersetEncoderTest; import org.apache.fop.afp.parser.MODCAParserTestCase; +import org.apache.fop.area.ViewportTestSuite; import org.apache.fop.fonts.DejaVuLGCSerifTest; +import org.apache.fop.fonts.truetype.GlyfTableTestCase; import org.apache.fop.image.loader.batik.ImageLoaderTestCase; import org.apache.fop.image.loader.batik.ImagePreloaderTestCase; import org.apache.fop.intermediate.IFMimickingTestCase; -import org.apache.fop.render.afp.AFPTestSuite; import org.apache.fop.render.extensions.prepress.PageBoundariesTest; import org.apache.fop.render.extensions.prepress.PageScaleTest; import org.apache.fop.render.pdf.PDFAConformanceTestCase; @@ -53,14 +54,17 @@ public class StandardTestSuite { //$JUnit-BEGIN$ suite.addTest(BasicDriverTestSuite.suite()); suite.addTest(UtilityCodeTestSuite.suite()); + suite.addTest(org.apache.fop.afp.AFPTestSuite.suite()); suite.addTest(new TestSuite(PDFAConformanceTestCase.class)); suite.addTest(new TestSuite(PDFEncodingTestCase.class)); suite.addTest(new TestSuite(PDFCMapTestCase.class)); suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class)); suite.addTest(new TestSuite(DejaVuLGCSerifTest.class)); suite.addTest(new TestSuite(MODCAParserTestCase.class)); - suite.addTest(AFPTestSuite.suite()); + suite.addTest(new TestSuite(CharactersetEncoderTest.class)); + suite.addTest(org.apache.fop.render.afp.AFPTestSuite.suite()); suite.addTest(PSTestSuite.suite()); + suite.addTest(new TestSuite(GlyfTableTestCase.class)); suite.addTest(RichTextFormatTestSuite.suite()); suite.addTest(new TestSuite(ImageLoaderTestCase.class)); suite.addTest(new TestSuite(ImagePreloaderTestCase.class)); Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/UtilityCodeTestSuite.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=1177244&r1=1177243&r2=1177244&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/UtilityCodeTestSuite.java (original) +++ xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/UtilityCodeTestSuite.java Thu Sep 29 09:49:24 2011 @@ -23,6 +23,9 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.fop.events.BasicEventTestCase; +import org.apache.fop.pdf.FileIDGeneratorTestCase; +import org.apache.fop.pdf.PDFEncryptionJCETestCase; +import org.apache.fop.pdf.PDFFactoryTestCase; import org.apache.fop.pdf.PDFObjectTestCase; import org.apache.fop.traits.BorderPropsTestCase; import org.apache.fop.util.BitmapImageUtilTestCase; @@ -46,6 +49,8 @@ public class UtilityCodeTestSuite { //$JUnit-BEGIN$ suite.addTest(new TestSuite(PDFNumberTestCase.class)); suite.addTest(new TestSuite(PDFObjectTestCase.class)); + suite.addTest(FileIDGeneratorTestCase.suite()); + suite.addTest(new TestSuite(PDFFactoryTestCase.class)); suite.addTest(new TestSuite(ColorUtilTestCase.class)); suite.addTest(new TestSuite(BorderPropsTestCase.class)); suite.addTest(new TestSuite(ElementListUtilsTestCase.class)); @@ -53,6 +58,7 @@ public class UtilityCodeTestSuite { suite.addTest(new TestSuite(XMLResourceBundleTestCase.class)); suite.addTest(new TestSuite(URIResolutionTestCase.class)); suite.addTest(new TestSuite(BitmapImageUtilTestCase.class)); + suite.addTest(new TestSuite(PDFEncryptionJCETestCase.class)); //$JUnit-END$ return suite; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
