hopefully version 1.3
This commit is contained in:
@@ -3,12 +3,12 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.github.rayman2200</groupId>
|
<groupId>com.github.rayman2200</groupId>
|
||||||
<artifactId>mustang-sample-project</artifactId>
|
<artifactId>mustang-sample-project</artifactId>
|
||||||
<version>1.3.0-SNAPSHOT</version>
|
<version>1.3.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>org.mustangproject.ZUGFeRD</groupId>
|
<groupId>org.mustangproject.ZUGFeRD</groupId>
|
||||||
<artifactId>mustang</artifactId>
|
<artifactId>mustang</artifactId>
|
||||||
<version>1.3.0-SNAPSHOT</version>
|
<version>1.3.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Mustang</name>
|
<name>Mustang</name>
|
||||||
@@ -68,4 +68,8 @@
|
|||||||
</developer>
|
</developer>
|
||||||
</developers>
|
</developers>
|
||||||
|
|
||||||
|
|
||||||
|
<scm>
|
||||||
|
<tag>mustang-1.3.0</tag>
|
||||||
|
</scm>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -381,7 +381,13 @@ public class ZUGFeRDExporter {
|
|||||||
return getA1ParserValidationResult(parser);
|
return getA1ParserValidationResult(parser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***
|
||||||
|
* Will return a boolean if the inputstream is valid PDF/A-1 and close the input stream
|
||||||
|
* @param file
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
public boolean isValidA1(InputStream file) {
|
public boolean isValidA1(InputStream file) {
|
||||||
|
|
||||||
ByteArrayDataSource fd;
|
ByteArrayDataSource fd;
|
||||||
try {
|
try {
|
||||||
fd = new ByteArrayDataSource(file);
|
fd = new ByteArrayDataSource(file);
|
||||||
@@ -439,11 +445,22 @@ public class ZUGFeRDExporter {
|
|||||||
public PDDocumentCatalog PDFmakeA3compliant(InputStream file,
|
public PDDocumentCatalog PDFmakeA3compliant(InputStream file,
|
||||||
String producer, String creator, boolean attachZugferdHeaders)
|
String producer, String creator, boolean attachZugferdHeaders)
|
||||||
throws IOException, TransformerException {
|
throws IOException, TransformerException {
|
||||||
|
/* cache the file content in memory, unfortunately the next step, isValidA1,
|
||||||
|
* will close the input stream but the step thereafter (loadPDFA3) needs
|
||||||
|
* and open one*/
|
||||||
|
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||||
|
byte[] buf = new byte[1024];
|
||||||
|
int n = 0;
|
||||||
|
while ((n = file.read(buf)) >= 0)
|
||||||
|
baos.write(buf, 0, n);
|
||||||
|
byte[] content = baos.toByteArray();
|
||||||
|
|
||||||
if (!ignoreA1Errors && !isValidA1(file)) {
|
InputStream is1 = new ByteArrayInputStream(content);
|
||||||
|
if (!ignoreA1Errors && !isValidA1(is1)) {
|
||||||
throw new IOException("File is not a valid PDF/A-1 input file");
|
throw new IOException("File is not a valid PDF/A-1 input file");
|
||||||
}
|
}
|
||||||
loadPDFA3(file);
|
InputStream is2 = new ByteArrayInputStream(content);
|
||||||
|
loadPDFA3(is2);
|
||||||
|
|
||||||
return makeDocPDFA3compliant(producer, creator, attachZugferdHeaders);
|
return makeDocPDFA3compliant(producer, creator, attachZugferdHeaders);
|
||||||
}
|
}
|
||||||
|
|||||||
4
pom.xml
4
pom.xml
@@ -2,14 +2,14 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.github.rayman2200</groupId>
|
<groupId>com.github.rayman2200</groupId>
|
||||||
<artifactId>mustang-sample-project</artifactId>
|
<artifactId>mustang-sample-project</artifactId>
|
||||||
<version>1.3.0-SNAPSHOT</version>
|
<version>1.3.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</connection>
|
<connection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</connection>
|
||||||
<developerConnection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</developerConnection>
|
<developerConnection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</developerConnection>
|
||||||
<url>https://github.com/AlexanderSchmidt/PDFA3.git</url>
|
<url>https://github.com/AlexanderSchmidt/PDFA3.git</url>
|
||||||
<tag>HEAD</tag>
|
<tag>mustang-sample-project-1.3.0</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
|||||||
Reference in New Issue
Block a user