[Jboss-cvs] JBoss Messaging SVN: r1187 - in trunk: . src/etc tests/src/org/jboss/test/messaging/jms

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2006-08-03 16:11:09 -0400 (Thu, 03 Aug 2006)
New Revision: 1187

Modified:
   trunk/build-messaging.xml
   trunk/src/etc/default.mf
   trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-483

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2006-08-03 19:38:52 UTC (rev 1186)
+++ trunk/build-messaging.xml	2006-08-03 20:11:09 UTC (rev 1187)
@@ -69,13 +69,13 @@
    </tstamp>
 
    <property name="messaging.specification.title" value="${module.Name}"/>
-   <property name="messaging.specification.version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>
-   <property name="messaging.specification.vendor" value="JBoss (http://www.jboss.org/)"/>
+   <property name="messaging.specification.version" value="${module.version}"/>
+   <property name="messaging.specification.vendor" value="JBoss Inc. (http://www.jboss.org/)"/>
 
    <property name="messaging.implementation.title" value="${module.Name}"/>
    <property name="messaging.implementation.url" value="http://www.jboss.org/"/>
    <property name="messaging.implementation.version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag} (build: CVSTag=${messaging.version.cvstag} date=${build.number})"/>
-   <property name="messaging.implementation.vendor" value="JBoss Inc."/>
+   <property name="messaging.implementation.vendor" value="${messaging.specification.vendor}"/>
    <property name="messaging.implementation.vendor.id" value="${messaging.implementation.url}"/>
 
    <property environment="ENV"/>
@@ -352,6 +352,11 @@
             <filter token="MESSAGING_VERSION_MINOR" value="${messaging.version.minor}"/>
             <filter token="MESSAGING_VERSION_INCREMENTING" value="${messaging.version.incrementing}"/>
             <filter token="MODULE_NAME" value="${module.Name}"/>
+            <filter token="MODULE_VENDOR" value="${messaging.specification.vendor}"/>
+            <filter token="MODULE_URL" value="${messaging.implementation.url}"/>
+            <filter token="MODULE_IMPLEMENTATION_VERSION" value="${messaging.implementation.version}"/>
+            <filter token="JAVA_VM_VERSION" value="${java.vm.version}"/>
+            <filter token="JAVA_VM_VENDOR" value="${java.vm.vendor}"/>
          </filterset>
       </copy>
       <move file="${build.etc}/VERSION-PRE-SUBSTITUTE" toFile="${build.etc}/VERSION"/>

Modified: trunk/src/etc/default.mf
===================================================================
--- trunk/src/etc/default.mf	2006-08-03 19:38:52 UTC (rev 1186)
+++ trunk/src/etc/default.mf	2006-08-03 20:11:09 UTC (rev 1187)
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @messaging.specification.title@
-Specification-Version: @messaging.specification.version@
-Specification-Vendor: @messaging.specification.vendor@
-Implementation-Title: @messaging.implementation.title@
-Implementation-URL: @messaging.implementation.url@
-Implementation-Version: @messaging.implementation.version@
-Implementation-Vendor: @messaging.implementation.vendor@
-Implementation-Vendor-Id: @messaging.implementation.vendor.id@
+Created-By: @JAVA_VM_VERSION@ (@JAVA_VM_VENDOR@)
+Specification-Title: @MODULE_NAME@
+Specification-Version: @MODULE_VERSION@
+Specification-Vendor: @MODULE_VENDOR@
+Implementation-Title: @MODULE_NAME@
+Implementation-URL: @MODULE_URL@
+Implementation-Version: @MODULE_IMPLEMENTATION_VERSION@
+Implementation-Vendor: @MODULE_VENDOR@
+Implementation-Vendor-Id: @MODULE_URL@

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java	2006-08-03 19:38:52 UTC (rev 1186)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java	2006-08-03 20:11:09 UTC (rev 1187)
@@ -75,6 +75,7 @@
       // The jar must be there
       File file = new File(userDir, "jboss-messaging.jar");
       assertTrue(file.exists());
+
       // Open the jar and load MANIFEST.MF
       JarFile jar = new JarFile(file);
       Manifest manifest = jar.getManifest();