svn commit: r1571852 - in /pdfbox/trunk: pdfbox/src/main/java/org/apache/pdfbox/ preflight/src/main/java/org/apache/pdfbox/preflight/ tools/src/main/java/org/apache/pdfbox/tools/

[ja...@apache.org]

Author: jahewson
Date: Tue Feb 25 22:43:20 2014
New Revision: 1571852

URL: http://svn.apache.org/r1571852
Log:
PDFBOX-1943: move Version to pdfbox-tools

Added:
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java
      - copied, changed from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Version.java
Removed:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Version.java
Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java?rev=1571852&r1=1571851&r2=1571852&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java Tue Feb 25 22:43:20 2014
@@ -27,8 +27,8 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+import java.util.Properties;
 
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
@@ -40,11 +40,11 @@ import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.Version;
 import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
 import org.apache.pdfbox.preflight.exception.SyntaxValidationException;
 import org.apache.pdfbox.preflight.parser.PreflightParser;
 import org.apache.pdfbox.preflight.parser.XmlResultParser;
+import org.apache.pdfbox.util.ResourceLoader;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -140,14 +140,17 @@ public class Validator_A1b
 
     }
 
-    private static void usage () {
+    private static void usage () throws IOException {
+        Properties props = ResourceLoader.loadProperties("org/apache/pdfbox/resources/pdfbox.properties", false);
+        String version = props.getProperty( "pdfbox.version", "unknown" );
+
         System.out.println("Usage : java org.apache.pdfbox.preflight.Validator_A1b [xml] [mode] <file path>");
         System.out.println();
         System.out.println(" * xml : if set, generate xml output");
         System.out.println(" * mode : if set, <file path> must be a file containing PDF to parse, can have 2 values");
         System.out.println("       batch : for each file of the list and xml file is generated");
         System.out.println("       group : generate an xml result for all the file of the list.");
-        System.out.println("Version : " + Version.getVersion());
+        System.out.println("Version : " + version);
     }
 
     private static int runSimple (DataSource fd) throws Exception {

Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java?rev=1571852&r1=1571851&r2=1571852&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java Tue Feb 25 22:43:20 2014
@@ -17,8 +17,6 @@
 package org.apache.pdfbox.tools;
 
 
-import org.apache.pdfbox.Version;
-
 /**
  * Simple wrapper around all the command line utilities included in PDFBox.
  * Used as the main class in the runnable standalone PDFBox jar.

Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java (from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Version.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Version.java&r1=1571090&r2=1571852&rev=1571852&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Version.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java Tue Feb 25 22:43:20 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox;
+package org.apache.pdfbox.tools;
 
 import java.io.IOException;