[jboss-cvs] JBossAS SVN: r94106 - in branches/EMBEDDED_JBOSS_BETA3: embedded and 1 other directory.

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

Author: manaRH
Date: 2009-09-29 10:27:24 -0400 (Tue, 29 Sep 2009)
New Revision: 94106

Modified:
   branches/EMBEDDED_JBOSS_BETA3/build/build-thirdparty.xml
   branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
Log:
JBPAPP-2012, plus some fixing of producing jars - eliminated duplicate files in jars while they are repackaged

Modified: branches/EMBEDDED_JBOSS_BETA3/build/build-thirdparty.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/build/build-thirdparty.xml	2009-09-29 14:22:30 UTC (rev 94105)
+++ branches/EMBEDDED_JBOSS_BETA3/build/build-thirdparty.xml	2009-09-29 14:27:24 UTC (rev 94106)
@@ -106,7 +106,7 @@
     <componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
     <componentref name="jboss/messaging" version="1.4.0.SP1-brew"/>
-    <componentref name="jboss/metadata" version="1.0.0.Beta4"/>
+    <componentref name="jboss/metadata" version="1.0.0.Beta4_patch"/>
     <componentref name="jboss/microcontainer" version="2.0.0.Beta9"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.2.2.SP3-brew"/>

Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml	2009-09-29 14:22:30 UTC (rev 94105)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml	2009-09-29 14:27:24 UTC (rev 94106)
@@ -17,6 +17,8 @@
 <!-- $Id: build.xml 58906 2006-12-07 18:21:00Z thomas.diesler at jboss.com $ -->
 
 <project default="main" name="JBoss/Embedded">
+	
+   <property name="embedded.version" value="embedded-jboss-beta3.SP12"/>
 
    <!-- ================================================================== -->
    <!-- Setup                                                              -->
@@ -332,6 +334,11 @@
       </copy>
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-tomcat-bootstrap.jar">
+      	<manifest>
+      	    <attribute name="Built-By" value="${user.name}"/>
+	   	      <attribute name="Specification-Version" value="${embedded.version}"/>
+      	      <attribute name="Implementation-Version" value="${embedded.version} ${TODAY}"/> 
+      	 </manifest>
          <fileset dir="${build.classes}">
             <include name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
             <include name="org/jboss/embedded/tomcat/WebinfScanner.class"/>
@@ -340,7 +347,12 @@
       </jar>
    	
       
-   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded.jar">
+   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded.jar">
+      	<manifest>
+      	    <attribute name="Built-By" value="${user.name}"/>
+	   	      <attribute name="Specification-Version" value="${embedded.version}"/>
+      	      <attribute name="Implementation-Version" value="${embedded.version} ${TODAY}"/> 
+      	 </manifest>
    	     <fileset dir="${build.classes}">
    	        <include name="org/jboss/embedded/**"/>
    	        <exclude name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
@@ -350,6 +362,13 @@
    	  </jar>
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar" duplicate="preserve">
+      	 
+      	<manifest>
+      	    <attribute name="Built-By" value="${user.name}"/>
+	   	      <attribute name="Specification-Version" value="${embedded.version}"/>
+      	      <attribute name="Implementation-Version" value="${embedded.version} ${TODAY}"/> 
+      	 </manifest>
+      	
          <fileset dir="${build.classes}">
             <exclude name="org/jboss/embedded/**"/>
          </fileset>
@@ -454,6 +473,11 @@
 
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/hibernate-all.jar" duplicate="preserve">
+      	<manifest>
+      	    <attribute name="Built-By" value="${user.name}"/>
+	   	      <attribute name="Specification-Version" value="${embedded.version}"/>
+      	      <attribute name="Implementation-Version" value="${embedded.version} ${TODAY}"/> 
+      	 </manifest>
          <zipfileset src="${hibernate.lib}/hibernate3.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
          <zipfileset src="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
@@ -464,6 +488,11 @@
 
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/thirdparty-all.jar" duplicate="preserve">
+      	<manifest>
+      	    <attribute name="Built-By" value="${user.name}"/>
+	   	      <attribute name="Specification-Version" value="${embedded.version}"/>
+      	      <attribute name="Implementation-Version" value="${embedded.version} ${TODAY}"/> 
+      	 </manifest>
          <zipfileset src="${apache.log4j.lib}/log4j.jar"/>
          <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
          <zipfileset src="${antlr.antlr.lib}/antlr.jar"/>