[tomee] branch master updated: Add cleanup before generating keys. Make sure new keys are generated for every test run.

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 2831015  Add cleanup before generating keys. Make sure new keys are generated for every test run.
     new d76e5ec  Merge pull request #483 from doychin/ws-security-key-gen-fix
2831015 is described below

commit 2831015bf247111be0fd123264d13fb374537e5e
Author: Doychin Bondzhev <do...@dsoft-bg.com>
AuthorDate: Mon Jun 10 10:37:12 2019 +0300

    Add cleanup before generating keys. Make sure new keys are generated for every test run.
    
    Signed-off-by: Doychin Bondzhev <do...@dsoft-bg.com>
---
 examples/webservice-ws-security/create-keystores.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/examples/webservice-ws-security/create-keystores.xml b/examples/webservice-ws-security/create-keystores.xml
index 7a52ed6..5f2c056 100644
--- a/examples/webservice-ws-security/create-keystores.xml
+++ b/examples/webservice-ws-security/create-keystores.xml
@@ -192,9 +192,25 @@
     </java>
   </target>
 
+  <target name="cleanup">
+    <patternset id="key.files">
+      <include name="*.jks"/>
+      <include name="*.rsa"/>
+    </patternset>
+
+    <delete>
+      <fileset dir="${basedir}/target/classes/META-INF/">
+        <patternset  refid="key.files"/>
+      </fileset>
+      <fileset dir="${basedir}/target/test-classes/META-INF/">
+        <patternset  refid="key.files"/>
+      </fileset>
+    </delete>
+  </target>
+
   <!-- run everything from our main target -->
   <!-- the other targets will only be run when their properties are true -->
-  <target name="run" depends="do.sun.jdk, do.ibm.jdk">
+  <target name="run" depends="cleanup, do.sun.jdk, do.ibm.jdk">
     <echo message="Running JDK specific keystore creation target"/>
   </target>