Move mysql data (but not socket) back under 'target'

zanata · Jan 19, 2015 · 6c5bb2c · 6c5bb2c
1 parent 49d2df9
commit 6c5bb2c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/functional-test/etc/mysql-data.groovy b/functional-test/etc/mysql-data.groovy
diff --git a/functional-test/etc/mysql-socket.groovy b/functional-test/etc/mysql-socket.groovy
@@ -0,0 +1,17 @@
+// This script sets the Maven project property 'mysql.socket'
+// to a short path under /tmp (derived from the project build directory)
+// and optionally deletes the socket file if it exists.
+
+import java.security.MessageDigest
+
+def messageDigest = MessageDigest.getInstance("MD5")
+messageDigest.update(project.build.directory.bytes);
+String md5Hex = messageDigest.digest().encodeHex()
+
+File mysqlSocket = new File(System.getProperty('java.io.tmpdir'), 'mysql-'+md5Hex+'.socket')
+project.properties['mysql.socket'] = mysqlSocket.absolutePath
+
+if (project.properties['delete'] == 'true') {
+    log.info('Deleting mysql.socket file: ' + mysqlSocket)
+    mysqlSocket.delete();
+}
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -458,7 +458,7 @@
             <configuration>
               <classifier>mysql.classifier</classifier>
               <port>${mysql.port}</port>
-              <data>${mysql.data}</data>
+              <socket>${mysql.socket}</socket>
             </configuration>
             <executions>
               <execution>
@@ -693,7 +693,8 @@
               <properties>
                 <delete>true</delete>
               </properties>
-              <source>${project.basedir}/etc/mysql-data.groovy</source>
+              <!-- Sets property mysql.socket -->
+              <source>${project.basedir}/etc/mysql-socket.groovy</source>
             </configuration>
           </execution>
           <execution>
@@ -706,7 +707,8 @@
               <properties>
                 <delete>false</delete>
               </properties>
-              <source>${project.basedir}/etc/mysql-data.groovy</source>
+              <!-- Sets property mysql.socket -->
+              <source>${project.basedir}/etc/mysql-socket.groovy</source>
             </configuration>
           </execution>
         </executions>

diff --git a/pom.xml b/pom.xml
@@ -1006,7 +1006,7 @@
         <plugin>
           <groupId>com.jcabi</groupId>
           <artifactId>jcabi-mysql-maven-plugin</artifactId>
-          <version>0.4</version>
+          <version>0.9</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.gmaven</groupId>