From: Date: September 4 2007 11:39pm
Subject: Connector/J commit: r6556 - in trunk: . connector-j
List-Archive: http://lists.mysql.com/commits/33674
X-Bug: 21116
Message-Id: <200709042139.l84LdmKd002217@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/
   trunk/connector-j/build.xml
Log:
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: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6550 /branches/branch_5_1:1-6517,6544
   + /branches/branch_5_0:1-6555 /branches/branch_5_1:1-6517,6544

Modified: trunk/connector-j/build.xml
===================================================================
--- trunk/connector-j/build.xml	2007-09-04 21:19:51 UTC (rev 6555)
+++ trunk/connector-j/build.xml	2007-09-04 21:39:47 UTC (rev 6556)
@@ -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>