Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 69dcf619f -> 4c4d4371a
TOMEE-1519 Give Windows a second chance to delete this object. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4c4d4371 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4c4d4371 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4c4d4371 Branch: refs/heads/tomee-1.7.x Commit: 4c4d4371a69ce6f6f7e0539b675e8cb572a81efa Parents: 69dcf61 Author: Thiago Veronezi <[email protected]> Authored: Mon Feb 23 06:47:36 2015 -0500 Committer: Thiago Veronezi <[email protected]> Committed: Mon Feb 23 06:47:36 2015 -0500 ---------------------------------------------------------------------- .../main/groovy/commands/SetupCommand.groovy | 29 ++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4c4d4371/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy index 59fc4b2..512f89e 100644 --- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy +++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package commands import org.apache.tomee.installer.Installer @@ -28,7 +27,7 @@ class SetupCommand { def pom def log def project - def ant + AntBuilder ant def properties def require(String name) { @@ -46,6 +45,15 @@ class SetupCommand { return value } + def deleteWithRetry = { + try { + ant.delete(it) + } catch (e) { + log.warn("RETRY Deleting: ${it}") + ant.delete(it) + } + } + def execute() { String tomcatVersion = require('tomcat.version') System.setProperty('tomcat.version', tomcatVersion) @@ -94,21 +102,20 @@ class SetupCommand { // clean up duplicate jars since in TomEE it is useless // = gain of space ;) - ant.delete(file: paths.getJAXBImpl()) - ant.delete(file: paths.getOpenEJBTomcatLoaderJar()) - ant.delete(file: paths.findTomEELibJar('jaxb-impl')) - ant.delete(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String)) + deleteWithRetry(file: paths.getJAXBImpl()) + deleteWithRetry(file: paths.getOpenEJBTomcatLoaderJar()) + deleteWithRetry(file: paths.findTomEELibJar('jaxb-impl')) + deleteWithRetry(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String)) // we need the one without version - ant.delete(file: paths.findOpenEJBWebJar('tomee-loader')) - ant.delete(file: paths.findOpenEJBWebJar('swizzle-stream')) + deleteWithRetry(file: paths.findOpenEJBWebJar('tomee-loader')) + deleteWithRetry(file: paths.findOpenEJBWebJar('swizzle-stream')) log.info('Assigning execute privileges to scripts in Tomcat bin directory') ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: 'u+x', includes: '**/*.sh') - ant.delete(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples") - ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/LICENSE") - ant.delete(file: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee/META-INF/NOTICE") + deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples") + deleteWithRetry(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee") } }
