[jboss-cvs] JBoss Messaging SVN: r7572 - in trunk: src/config/common and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 15 08:28:59 EDT 2009
Author: jmesnil
Date: 2009-07-15 08:28:58 -0400 (Wed, 15 Jul 2009)
New Revision: 7572
Added:
trunk/src/config/common/jboss-messaging-version.properties
Removed:
trunk/src/config/common/version.properties
Modified:
trunk/build-messaging.xml
trunk/src/main/org/jboss/messaging/utils/VersionLoader.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
Log:
JBMESSAGING-1616: Classpath issue with file version.properties
* renamed version.properties to jboss-messaging-version.properties to ensure uniqueness and avoid picking up another version.properties from the classpath
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-07-15 10:31:37 UTC (rev 7571)
+++ trunk/build-messaging.xml 2009-07-15 12:28:58 UTC (rev 7572)
@@ -41,8 +41,8 @@
<!-- ======================================================================================== -->
<property name="module.name" value="messaging"/>
- <!-- Version properties are read rom version.properties instead of duplicating them here -->
- <property file="src/config/common/version.properties"/>
+ <!-- Version properties are read from jboss-messaging-version.properties instead of duplicating them here -->
+ <property file="src/config/common/jboss-messaging-version.properties"/>
<property name="messaging.version.revision" value="0" />
<property name="messaging.version.svnurl" value="https://svn.jboss.org/repos/messaging/trunk"/>
<property name="messaging.version.string"
@@ -248,7 +248,7 @@
<path id="unit.test.execution.classpath">
<!-- ensure that the core client jar is included for
- tests security tests which needs to read version.properties
+ tests security tests which needs to read jboss-messaging-version.properties
from inside this jar
-->
<fileset dir="${build.jars.dir}">
@@ -386,13 +386,9 @@
<javah class="org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl"
classpath="${build.core.classes.dir}" destdir="./native/src"/>
- <copy file="${src.config.dir}/common/version.properties"
- tofile="${build.core.classes.dir}/version.properties"/>
+ <copy file="${src.config.dir}/common/jboss-messaging-version.properties"
+ tofile="${build.core.classes.dir}/jboss-messaging-version.properties"/>
- <!--
-<echo message="messaging.version.versionName=${messaging.version.name}${line.separator}messaging.version.majorVersion=${messaging.version.major}${line.separator}messaging.version.minorVersion=${messaging.version.minor}${line.separator}messaging.version.microVersion=${messaging.version.micro}${line.separator}messaging.version.incrementingVersion=${messaging.version.incrementing}${line.separator}messaging.version.versionSuffix=${messaging.version.suffix}${line.separator}"
- file="${build.classes.dir}/version.properties"/>
- -->
</target>
<target name="compile-jms" depends="compile-core">
@@ -669,7 +665,7 @@
<target name="jar-core-client" depends="compile-core">
<jar jarfile="${build.jars.dir}/${core.client.jar.name}">
<fileset dir="${build.core.classes.dir}">
- <include name="version.properties"/>
+ <include name="jboss-messaging-version.properties"/>
<include name="org/jboss/messaging/core/client/**/*.class"/>
<include name="org/jboss/messaging/core/filter/**/*.class"/>
<include name="org/jboss/messaging/core/buffers/**/*.class"/>
@@ -774,7 +770,7 @@
<include name="logging.properties"/>
<include name="stand-alone/**"/>
<include name="jboss-as/**"/>
- <exclude name="common/version.properties" />
+ <exclude name="common/jboss-messaging-version.properties" />
<exclude name="*examples-ant.properties"/>
<exclude name="trunk"/>
</fileset>
Copied: trunk/src/config/common/jboss-messaging-version.properties (from rev 7519, trunk/src/config/common/version.properties)
===================================================================
--- trunk/src/config/common/jboss-messaging-version.properties (rev 0)
+++ trunk/src/config/common/jboss-messaging-version.properties 2009-07-15 12:28:58 UTC (rev 7572)
@@ -0,0 +1,7 @@
+messaging.version.versionName=maggot
+messaging.version.majorVersion=2
+messaging.version.minorVersion=0
+messaging.version.microVersion=0
+messaging.version.incrementingVersion=104
+messaging.version.versionSuffix=BETA3
+messaging.version.versionTag=beta3
Deleted: trunk/src/config/common/version.properties
===================================================================
--- trunk/src/config/common/version.properties 2009-07-15 10:31:37 UTC (rev 7571)
+++ trunk/src/config/common/version.properties 2009-07-15 12:28:58 UTC (rev 7572)
@@ -1,7 +0,0 @@
-messaging.version.versionName=maggot
-messaging.version.majorVersion=2
-messaging.version.minorVersion=0
-messaging.version.microVersion=0
-messaging.version.incrementingVersion=104
-messaging.version.versionSuffix=BETA3
-messaging.version.versionTag=beta3
Modified: trunk/src/main/org/jboss/messaging/utils/VersionLoader.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/VersionLoader.java 2009-07-15 10:31:37 UTC (rev 7571)
+++ trunk/src/main/org/jboss/messaging/utils/VersionLoader.java 2009-07-15 12:28:58 UTC (rev 7572)
@@ -35,12 +35,14 @@
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
* @author <a href="csuconic at redhat.com">Clebert Suconic</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*/
public class VersionLoader
{
private static final Logger log = Logger.getLogger(VersionLoader.class);
+ public static final String PROP_FILE_NAME = "jboss-messaging-version.properties";
private static Version version;
@@ -62,7 +64,7 @@
{
if (version == null)
{
- throw new RuntimeException("version.properties is not available");
+ throw new RuntimeException(PROP_FILE_NAME + " is not available");
}
return version;
@@ -71,12 +73,12 @@
private static Version load()
{
Properties versionProps = new Properties();
- InputStream in = VersionImpl.class.getClassLoader().getResourceAsStream("version.properties");
+ InputStream in = VersionImpl.class.getClassLoader().getResourceAsStream(PROP_FILE_NAME);
try
{
if (in == null)
{
- throw new RuntimeException("version.properties is not available");
+ throw new RuntimeException(PROP_FILE_NAME + " is not available");
}
try
{
@@ -97,7 +99,7 @@
catch (IOException e)
{
//if we get here then the messaging hasnt been built properly and the version.properties is skewed in some way
- throw new RuntimeException("unable to load version.properties", e);
+ throw new RuntimeException("unable to load " + PROP_FILE_NAME, e);
}
}
finally
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java 2009-07-15 10:31:37 UTC (rev 7571)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java 2009-07-15 12:28:58 UTC (rev 7572)
@@ -52,7 +52,7 @@
{
Version version = VersionLoader.getVersion();
Properties props = new Properties();
- props.load(ClassLoader.getSystemResourceAsStream("version.properties"));
+ props.load(ClassLoader.getSystemResourceAsStream(VersionLoader.PROP_FILE_NAME));
assertEquals(props.get("messaging.version.versionName"), version.getVersionName());
assertEquals(props.get("messaging.version.versionSuffix"), version.getVersionSuffix());
More information about the jboss-cvs-commits
mailing list