From aafabcf1694d1627c0b48db51b26f409e4c1700a Mon Sep 17 00:00:00 2001
From: Marc Prud'hommeaux <mprudhom@apache.org>
Date: Sun, 23 Jul 2006 22:01:46 +0000
Subject: [PATCH] Cleaned up version parsing and made it more robust

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@424834 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/openjpa/conf/OpenJPAVersion.java   | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
index a9ca5502a..54974f44d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
@@ -28,14 +28,12 @@ import java.util.StringTokenizer;
  */
 public class OpenJPAVersion {
 
-    public static final String VERSION_NUMBER = OpenJPAVersion.class
-        .getPackage().getImplementationVersion() == null ? "0.0.0" :
-        OpenJPAVersion.class.getPackage().getImplementationVersion();
+    public static final String VERSION_NUMBER;
     private static final long RELEASE_SECONDS = 1147454303;
 
     public static final Date RELEASE_DATE = new Date(RELEASE_SECONDS * 1000);
 
-    public static final String VERSION_ID = VERSION_NUMBER;
+    public static final String VERSION_ID;
     public static final String VENDOR_NAME = "OpenJPA";
     public static final int MAJOR_RELEASE;
     public static final int MINOR_RELEASE;
@@ -43,17 +41,40 @@ public class OpenJPAVersion {
     public static final String RELEASE_STATUS;
 
     static {
+        Package pack = OpenJPAVersion.class.getPackage();
+        String vers = pack == null ? null : pack.getImplementationVersion();
+        if (vers == null || vers.length() == 0)
+            vers = "0.0.0";
 
-        java.util.StringTokenizer tok =
-            new java.util.StringTokenizer(VERSION_NUMBER,
-                ".ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
-        MAJOR_RELEASE =
-            tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
-        MINOR_RELEASE =
-            tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
-        PATCH_RELEASE =
-            tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
-        RELEASE_STATUS = tok.hasMoreTokens() ? tok.nextToken(".") : "";
+        VERSION_NUMBER = vers;
+        VERSION_ID = VERSION_NUMBER;
+
+        StringTokenizer tok = new StringTokenizer(VERSION_NUMBER, ".-");
+
+        int major, minor, patch;
+
+        try {
+            major = tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
+        } catch (Exception e) {
+            major = 0;
+        }
+
+        try {
+            minor = tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
+        } catch (Exception e) {
+            minor = 0;
+        }
+
+        try {
+            patch = tok.hasMoreTokens() ? Integer.parseInt(tok.nextToken()) : 0;
+        } catch (Exception e) {
+            patch = 0;
+        }
+
+        MAJOR_RELEASE = major;
+        MINOR_RELEASE = minor;
+        PATCH_RELEASE = patch;
+        RELEASE_STATUS = tok.hasMoreTokens() ? tok.nextToken("!") : "";
     }
 
     public static void main(String [] args) {