Author: tilman
Date: Thu Jun 19 17:41:32 2014
New Revision: 1603972
URL: http://svn.apache.org/r1603972
Log:
PDFBOX-2151: Replace log4j with commons logging, as suggested by Simon Steiner;
fix imports
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ContextHelper.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
Thu Jun 19 17:41:32 2014
@@ -216,6 +216,7 @@ public abstract class ContentStreamEngin
registerOperatorProcessor("sh", stubOp);
}
+ @Override
public final void registerOperatorProcessor(String operator,
OperatorProcessor op)
{
super.registerOperatorProcessor(operator, op);
@@ -323,17 +324,19 @@ public abstract class ContentStreamEngin
}
catch (IllegalArgumentException e)
{
- /*
- * The color space is unknown. Try to access the resources
dictionary, the color space can be a
- * reference.
- */
- PDColorSpace pdCS = (PDColorSpace)
this.getColorSpaces().get(colorSpace);
- if (pdCS != null)
+ // The color space is unknown. Try to access the resources
dictionary,
+ // the color space can be a reference.
+ Map<String, PDColorSpace> colorSpaces =
this.getResources().getColorSpaces();
+ if (colorSpaces != null)
{
- cs = ColorSpaces.valueOf(pdCS.getName());
- PreflightConfiguration cfg = context.getConfig();
- ColorSpaceHelperFactory csFact =
cfg.getColorSpaceHelperFact();
- csHelper = csFact.getColorSpaceHelper(context, pdCS,
ColorSpaceRestriction.ONLY_DEVICE);
+ PDColorSpace pdCS = colorSpaces.get(colorSpace);
+ if (pdCS != null)
+ {
+ cs = ColorSpaces.valueOf(pdCS.getName());
+ PreflightConfiguration cfg = context.getConfig();
+ ColorSpaceHelperFactory csFact =
cfg.getColorSpaceHelperFact();
+ csHelper = csFact.getColorSpaceHelper(context,
pdCS, ColorSpaceRestriction.ONLY_DEVICE);
+ }
}
}
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
Thu Jun 19 17:41:32 2014
@@ -43,7 +43,6 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.graphics.PDGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.xobject.PDXObjectForm;
import org.apache.pdfbox.pdmodel.text.PDTextState;
-import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.ValidationException;
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
Thu Jun 19 17:41:32 2014
@@ -34,10 +34,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.cff.IndexData;
import org.apache.fontbox.cff.Type1CharStringParser;
import org.apache.fontbox.cff.Type1FontUtil;
-import org.apache.log4j.Logger;
import org.apache.pdfbox.encoding.Encoding;
import org.apache.pdfbox.encoding.MacRomanEncoding;
import org.apache.pdfbox.encoding.PdfDocEncoding;
@@ -47,7 +48,7 @@ import org.apache.pdfbox.encoding.WinAns
public final class Type1Parser
{
- public static final Logger LOGGER = Logger.getLogger(Type1Parser.class);
+ public static final Log LOGGER = LogFactory.getLog(Type1Parser.class);
protected static final char NAME_START = '/';
protected static final String NOTDEF = NAME_START + ".notdef";
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
Thu Jun 19 17:41:32 2014
@@ -21,10 +21,6 @@
package org.apache.pdfbox.preflight.graphic;
-import static
org.apache.pdfbox.preflight.PreflightConstants.DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS;
-import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_OUTPUT_INTENT_ICC_PROFILE_INVALID;
-import static org.apache.pdfbox.preflight.PreflightConstants.*;
-
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
import java.io.IOException;
@@ -35,6 +31,9 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.common.PDStream;
+import static
org.apache.pdfbox.preflight.PreflightConstants.DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS;
+import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_OUTPUT_INTENT_ICC_PROFILE_INVALID;
+import static
org.apache.pdfbox.preflight.PreflightConstants.OUTPUT_INTENT_DICTIONARY_KEY_DEST_OUTPUT_PROFILE;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.PreflightDocument;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
Thu Jun 19 17:41:32 2014
@@ -38,7 +38,6 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.ValidationException;
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
Thu Jun 19 17:41:32 2014
@@ -32,7 +32,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
-import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.ValidationException;
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
Thu Jun 19 17:41:32 2014
@@ -22,8 +22,9 @@
package org.apache.pdfbox.preflight.utils;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Logger;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -40,7 +41,7 @@ import org.apache.pdfbox.persistence.uti
public class COSUtils
{
- public static final Logger LOGGER = Logger.getLogger(COSUtils.class);
+ public static final Log LOGGER = LogFactory.getLog(COSUtils.class);
/**
* return true if the elt is a COSDictionary or a reference to a
COSDictionary
@@ -482,9 +483,9 @@ public class COSUtils
}
/**
- * Close the given Document. If the close method of the document throws an
exception, it is logged using a log4j
- * logger (Level : WARN)
- *
+ * Close the given Document. If the close method of the document throws an
+ * exception, it is logged using a logger (Level : WARN)
+ *
* @param document
*/
public static void closeDocumentQuietly(COSDocument document)
@@ -503,9 +504,9 @@ public class COSUtils
}
/**
- * Close the given Document. If the close method of the document throws an
exception, it is logged using a log4j
- * logger (Level : WARN)
- *
+ * Close the given Document. If the close method of the document throws an
+ * exception, it is logged using a logger (Level : WARN)
+ *
* @param document
*/
public static void closeDocumentQuietly(PDDocument document)
Modified:
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ContextHelper.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ContextHelper.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ContextHelper.java
(original)
+++
pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ContextHelper.java
Thu Jun 19 17:41:32 2014
@@ -21,8 +21,8 @@
package org.apache.pdfbox.preflight.utils;
-import static org.apache.pdfbox.preflight.PreflightConstants.*;
import org.apache.pdfbox.preflight.PreflightConfiguration;
+import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_PDF_PROCESSING_MISSING;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.PreflightPath;
import org.apache.pdfbox.preflight.exception.ValidationException;
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
Thu Jun 19 17:41:32 2014
@@ -21,8 +21,6 @@
package org.apache.pdfbox.preflight.action.pdfa1b;
-import static org.junit.Assert.*;
-
import java.util.List;
import javax.activation.DataSource;
@@ -38,6 +36,8 @@ import org.apache.pdfbox.preflight.Prefl
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.action.AbstractActionManager;
import org.apache.pdfbox.preflight.action.ActionManagerFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public abstract class AbstractTestAction
{
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
Thu Jun 19 17:41:32 2014
@@ -25,9 +25,7 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.filespecification.PDFileSpecification;
-import org.apache.pdfbox.pdmodel.interactive.action.type.PDActionGoTo;
import org.apache.pdfbox.pdmodel.interactive.action.type.PDActionRemoteGoTo;
-import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDDestination;
import org.apache.pdfbox.preflight.PreflightConstants;
import org.junit.Test;
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
Thu Jun 19 17:41:32 2014
@@ -30,7 +30,8 @@ import javax.activation.FileDataSource;
import junit.framework.Assert;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.preflight.PreflightDocument;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
@@ -61,9 +62,9 @@ public abstract class AbstractInvalidFil
*/
protected File path;
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
- protected Logger logger = null;
+ protected Log logger = null;
/**
* Prepare the test for one file
@@ -77,7 +78,7 @@ public abstract class AbstractInvalidFil
{
this.path = path;
this.expectedError = error;
- this.logger = Logger.getLogger(this.getClass());
+ this.logger = LogFactory.getLog(this.getClass());
}
@Test()
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
Thu Jun 19 17:41:32 2014
@@ -32,7 +32,8 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -47,7 +48,7 @@ public class TestInvalidFiles extends Ab
private static final String ISARTOR_FILES = "invalid.files";
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
public TestInvalidFiles(File path, String error)
{
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
Thu Jun 19 17:41:32 2014
@@ -32,7 +32,8 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -47,7 +48,7 @@ public class TestIsartorValidation exten
private static final String ISARTOR_FILES = "isartor.files";
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
public TestIsartorValidation(File path, String error)
{
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
Thu Jun 19 17:41:32 2014
@@ -34,7 +34,8 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.preflight.PreflightDocument;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.exception.ValidationException;
@@ -58,14 +59,14 @@ public class TestValidFiles
protected File path;
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
- protected Logger logger = null;
+ protected Log logger = null;
public TestValidFiles(File path)
{
this.path = path;
- this.logger = Logger.getLogger(path != null ? path.getName() :
"dummy");
+ this.logger = LogFactory.getLog(path != null ? path.getName() :
"dummy");
}
protected static Collection<Object[]> stopIfExpected() throws Exception
Modified:
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java?rev=1603972&r1=1603971&r2=1603972&view=diff
==============================================================================
---
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
(original)
+++
pdfbox/branches/1.8/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
Thu Jun 19 17:41:32 2014
@@ -30,11 +30,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
