Author: pcl
Date: Tue Aug 28 10:00:16 2007
New Revision: 570487
URL: http://svn.apache.org/viewvc?rev=570487&view=rev
Log:
Changed OpenJPAVersion to load version information from a resource (like how we
load svn data) so that current version info (as of the last mvn compile) will
be available for code built and run from source.
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
openjpa/trunk/openjpa-lib/pom.xml
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?rev=570487&r1=570486&r2=570487&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
Tue Aug 28 10:00:16 2007
@@ -45,8 +45,21 @@
public static final String REVISION_NUMBER;
static {
- Package pack = OpenJPAVersion.class.getPackage();
- String vers = pack == null ? null : pack.getImplementationVersion();
+ Properties revisionProps = new Properties();
+ try {
+ InputStream in = OpenJPAVersion.class.getResourceAsStream
+ ("/META-INF/org.apache.openjpa.revision.properties");
+ if (in != null) {
+ try {
+ revisionProps.load(in);
+ } finally {
+ in.close();
+ }
+ }
+ } catch (Exception e) {
+ }
+
+ String vers = revisionProps.getProperty("openjpa.version");
if (vers == null || "".equals(vers.trim()))
vers = "0.0.0";
VERSION_NUMBER = vers;
@@ -71,21 +84,7 @@
patch = 0;
}
- String revision = "";
- try {
- InputStream in = OpenJPAVersion.class.getResourceAsStream
- ("/META-INF/org.apache.openjpa.revision.properties");
- if (in != null) {
- try {
- Properties props = new Properties();
- props.load(in);
- revision = props.getProperty("revision.number");
- } finally {
- in.close();
- }
- }
- } catch (Exception e) {
- }
+ String revision = revisionProps.getProperty("revision.number");
MAJOR_RELEASE = major;
MINOR_RELEASE = minor;
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=570487&r1=570486&r2=570487&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Tue Aug 28 10:00:16 2007
@@ -157,9 +157,11 @@
<property name="subversion.revision"
value="unknown"/>
<echo>Revision: ${subversion.revision}</echo>
+ <echo>OpenJPA version:
${project.version}</echo>
<mkdir dir="${outdir}/META-INF"/>
- <echo
file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision}</echo>
+ <echo
file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision}
+openjpa.version=${project.version}</echo>
<delete dir="${tmpdir}"/>
</tasks>
</configuration>
