svn commit: r1337825 - in /pdfbox/trunk/preflight: pom.xml src/main/java/org/apache/padaf/preflight/AbstractValidator.java src/main/java/org/apache/padaf/preflight/Validator_A1b.java

[gbailleul]

Author: gbailleul
Date: Sun May 13 09:48:39 2012
New Revision: 1337825

URL: http://svn.apache.org/viewvc?rev=1337825&view=rev
Log:
PDFBOX-1310 : use pdfbox Version class, specify version in main class

Modified:
    pdfbox/trunk/preflight/pom.xml
    
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/AbstractValidator.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/Validator_A1b.java

Modified: pdfbox/trunk/preflight/pom.xml
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1337825&r1=1337824&r2=1337825&view=diff
==============================================================================
--- pdfbox/trunk/preflight/pom.xml (original)
+++ pdfbox/trunk/preflight/pom.xml Sun May 13 09:48:39 2012
@@ -43,18 +43,6 @@
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <filtering>true</filtering>
-        <targetPath>../filtered-sources/java</targetPath>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <sourceDirectory>target/filtered-sources/java</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/AbstractValidator.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/AbstractValidator.java?rev=1337825&r1=1337824&r2=1337825&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/AbstractValidator.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/AbstractValidator.java
 Sun May 13 09:48:39 2012
@@ -33,17 +33,16 @@ import javax.activation.DataSource;
 import org.apache.padaf.preflight.ValidationResult.ValidationError;
 import org.apache.padaf.preflight.helpers.AbstractValidationHelper;
 import org.apache.padaf.preflight.javacc.ParseException;
+import org.apache.pdfbox.Version;
 
 public abstract class AbstractValidator implements PdfAValidator {
 
     protected ValidatorConfig config = null;
 
 
-    public static final String version = "${project.version}";
-    
     public static final Charset encoding = Charset.forName("ISO-8859-1");
 
-    public static final String fullName = "PADAF - "+version;
+    public static final String fullName = "PADAF - "+Version.getVersion();
 
 
     protected Collection<AbstractValidationHelper> priorHelpers = new 
ArrayList<AbstractValidationHelper>();
@@ -185,7 +184,7 @@ public abstract class AbstractValidator 
      * @see org.apache.padaf.preflight.PdfAValidator#getVersion()
      */
     public String getVersion() {
-        return version;
+        return Version.getVersion();
     }
 
 

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/Validator_A1b.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/Validator_A1b.java?rev=1337825&r1=1337824&r2=1337825&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/Validator_A1b.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/padaf/preflight/Validator_A1b.java
 Sun May 13 09:48:39 2012
@@ -24,6 +24,7 @@ package org.apache.padaf.preflight;
 import javax.activation.FileDataSource;
 
 import org.apache.padaf.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.Version;
 
 
 
@@ -41,6 +42,7 @@ public class Validator_A1b {
                if (args.length == 0) {
                        System.out
                        .println("Usage : java net.awl.edoc.pdfa.Validator 
<file path>");
+                       System.out.println("Version : "+Version.getVersion());
                        System.exit(1);
                }