From: Date: September 4 2007 11:50pm
Subject: Connector/J commit: r6557 - in branches/branch_5_1: . connector-j
List-Archive: http://lists.mysql.com/commits/33675
X-Bug: 21116
Message-Id: <200709042150.l84Lod42006299@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/branch_5_1/
   branches/branch_5_1/connector-j/build.xml
Log:
Merged revisions 6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6522,6524,6526-6528,6530-6531,6533-6534,6536-6537,6539-6540,6543-6545,6547,6549-6550,6552-6556 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/trunk

...............
  r6556 | mmatthews | 2007-09-04 16:39:47 -0500 (Tue, 04 Sep 2007) | 13 lines
  
  Merged revisions 6551-6555 via svnmerge from 
  svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0
  
  ........
    r6554 | mmatthews | 2007-09-04 16:17:57 -0500 (Tue, 04 Sep 2007) | 1 line
    
    Fixed BUG#21116, revision not updated in DBMD.getDriverVersion() when released (we now stuff in the svn revision of the directory).
  ........
    r6555 | mmatthews | 2007-09-04 16:19:51 -0500 (Tue, 04 Sep 2007) | 1 line
    
    Allow source builds to work, even if not checked out from SVN.
  ........
...............



Property changes on: branches/branch_5_1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6551
   + /trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6556

Modified: branches/branch_5_1/connector-j/build.xml
===================================================================
--- branches/branch_5_1/connector-j/build.xml	2007-09-04 21:39:47 UTC (rev 6556)
+++ branches/branch_5_1/connector-j/build.xml	2007-09-04 21:50:39 UTC (rev 6557)
@@ -123,6 +123,17 @@
 
 		<filter token="VERSION" value="${version}"/>
 
+		<mkdir dir="${buildDir}" />
+		
+		<exec executable="svn" 
+			output="${buildDir}/svn.properties" 
+			failifexecutionfails="false"
+			failonerror="false">
+			  <arg value="info" />
+		</exec>
+		    
+		<property prefix="svn" file="${buildDir}/svn.properties"/>
+		
 		<copy todir="${buildDir}/${fullProdName}" filtering="true">
 			<fileset dir="${sourceDir}/" excludes="**/CVS">
 				<patternset id="classjar" >
@@ -137,6 +148,7 @@
 				<filter token="MYSQL_CJ_SUBMINOR_VERSION" value="${subminor_version}"/>
 				<filter token="MYSQL_CJ_VERSION_STATUS" value="${version_status}"/>
 				<filter token="MYSQL_CJ_VERSION" value="${version}"/>
+				<filter token="MYSQL_CJ_REVISION" value="${svn.Revision}" />
 				<filter token="MYSQL_CJ_FULL_PROD_NAME" value="${fullProdName}"/>
 			</filterset>
 		</copy>