[jboss-cvs] JBossAS SVN: r100834 - trunk/build.

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

Author: pgier
Date: 2010-02-10 17:41:45 -0500 (Wed, 10 Feb 2010)
New Revision: 100834

Modified:
   trunk/build/build.xml
Log:
[JBAS-7718] Fix manifest entries in jbossall-client.jar

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-02-10 22:41:33 UTC (rev 100833)
+++ trunk/build/build.xml	2010-02-10 22:41:45 UTC (rev 100834)
@@ -45,11 +45,12 @@
       -  Initialize properties for each dependency in the thirdparty pom 
       -  The properties take the form "groupId:artifactId:packaging"
       -->
+    <maven:pom id="pom.project" file="pom.xml"/>
     <maven:dependencies filesetId="pom.dependencies"
                         versionsId="pom.dependencies.versions"
                         scopes="compile, runtime"
                         cacheDependencyRefs="true">
-      <pom file="${dist.pom.file}"/>
+      <pom refid="pom.project"/>
     </maven:dependencies>
 
     <mapper id="remove-versions" classpathref="maven-ant-tasks.classpath"
@@ -62,7 +63,7 @@
   <!-- Configuration                                                      -->
   <!-- ================================================================== -->
 
-  <target name="configure" depends="init">
+  <target name="configure" depends="init-dependencies">
 
     <!-- =================== -->
     <!-- Basic Configuration -->
@@ -79,12 +80,8 @@
     </tstamp>
     <property name="build.id" value="${build.number}"/>-->
 
-    <!-- Version identifiers for the server. -->
-    <xmlproperty file="../pom.xml" prefix="pom"/>
-    
     <!-- Module name(s) & version -->
     <property name="dist.module.name" value="jboss"/>
-    <property name="dist.module.Name" value="JBoss Build"/>
     <property name="dist.module.version" value="${pom.project.version}"/>
     <property name="dist.module.output" value="${basedir}/target"/>
 
@@ -206,7 +203,7 @@
                    module-console">
   </target>
   
-  <target name="install" depends="partition-build"
+  <target name="install" depends="partition-build, jboss-all-client"
           description="Install the structure for a release.">
   </target>
 
@@ -398,7 +395,6 @@
       </fileset>
     </copy>
 
-    <antcall target="jboss-all-client"/>
   </target>
 
   <target name="jboss-all-client" depends="init"
@@ -484,13 +480,13 @@
 
     <jar destfile="${install.client}/${jbossall.client.filename}" basedir="${dist.module.output}/temp">
       <manifest>
-        <attribute name="Specification-Title" value="${specification.title}"/>
-        <attribute name="Specification-Version" value="${specification.version}"/>
-        <attribute name="Specification-Vendor" value="${specification.vendor}"/>
-        <attribute name="Implementation-Title" value="${implementation.title}"/>
-        <attribute name="Implementation-Version" value="${implementation.version}"/>
-        <attribute name="Implementation-Vendor" value="${implementation.vendor}"/>
-        <attribute name="Implementation-Vendor-Id" value="${implementation.vendor.id}"/>
+        <attribute name="Specification-Title" value="${pom.project.name}"/>
+        <attribute name="Specification-Version" value="${pom.project.version}"/>
+        <attribute name="Specification-Vendor" value="${pom.project.organization.name}"/>
+        <attribute name="Implementation-Title" value="${pom.project.name}"/>
+        <attribute name="Implementation-Version" value="${pom.project.version}"/>
+        <attribute name="Implementation-Vendor" value="${pom.project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${pom.project.groupId}"/>
         <attribute name="Class-Path" value="${client.jar.manifest.classpath}"/>
       </manifest>
     </jar>