Repository: tomee Updated Branches: refs/heads/master c4cccb5a6 -> c4bd8633d
TOMEE-1708 use dir instead of arbitrary using target to download tomee Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c4bd8633 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c4bd8633 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c4bd8633 Branch: refs/heads/master Commit: c4bd8633d96868be061d08390dd03b65cdc90cac Parents: c4cccb5 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Wed Feb 10 13:54:50 2016 +0100 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Wed Feb 10 13:54:50 2016 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/arquillian/common/Setup.java | 14 ++++++++------ .../tomee/arquillian/remote/RemoteTomEEContainer.java | 2 +- .../tomee/arquillian/webapp/TomEEWebappContainer.java | 12 ++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java index 1d67531..eab496c 100644 --- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java +++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java @@ -145,19 +145,21 @@ public class Setup { return null; } - public static File downloadAndUnpack(final File dir, final String artifactID) throws LifecycleException { + public static File downloadAndUnpack(final File dir, final String artifactID, final String defaultTempDir) throws LifecycleException { - final File zipFile = downloadFile(artifactID, null); + final File zipFile = downloadFile(artifactID, null, defaultTempDir); Zips.unzip(zipFile, dir); return findHome(dir); } - public static File downloadFile(final String artifactName, final String altUrl) { - final String cache = SystemInstance.get().getOptions().get(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, (String) null); - if (cache == null) { // let the user override it - System.setProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, "target"); + public static File downloadFile(final String artifactName, final String altUrl, final String defaultTempDir) { + final String cache = SystemInstance.isInitialized() ? + SystemInstance.get().getOptions().get(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, (String) null) : + System.getProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER); + if (cache == null && defaultTempDir != null) { // let the user override it + System.setProperty(ProvisioningResolver.OPENEJB_DEPLOYER_CACHE_FOLDER, defaultTempDir); } try { http://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java index 1593db2..efdc76e 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java @@ -215,7 +215,7 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio tomeeHome = Setup.findHome(workingDirectory); if (tomeeHome == null) { - tomeeHome = Setup.downloadAndUnpack(workingDirectory, configuration.getArtifactName()); + tomeeHome = Setup.downloadAndUnpack(workingDirectory, configuration.getArtifactName(), configuration.getDir()); logger.log(Level.INFO, "Downloaded container to: " + tomeeHome); } http://git-wip-us.apache.org/repos/asf/tomee/blob/c4bd8633/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java index 152ce0d..53d139a 100644 --- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java +++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java @@ -83,7 +83,7 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio if (openejbHome == null) { - downloadTomcat(workingDirectory, configuration.getTomcatVersion()); + downloadTomcat(workingDirectory, configuration.getTomcatVersion(), configuration.getDir()); openejbHome = Setup.findHome(workingDirectory); @@ -92,7 +92,7 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio final File webapp = new File(openejbHome, "webapps" + s + "tomee"); Files.mkdir(webapp); - downloadOpenEJBWebapp(webapp); + downloadOpenEJBWebapp(webapp, configuration.getDir()); System.setProperty("catalina.home", openejbHome.getAbsolutePath()); System.setProperty("catalina.base", openejbHome.getAbsolutePath()); @@ -202,13 +202,13 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio } } - protected void downloadOpenEJBWebapp(final File targetDirectory) throws LifecycleException { + protected void downloadOpenEJBWebapp(final File targetDirectory, final String defaultTempDir) throws LifecycleException { final String artifactName = configuration.getArtifactName(); - final File zipFile = Setup.downloadFile(artifactName, null); + final File zipFile = Setup.downloadFile(artifactName, null, defaultTempDir); Zips.unzip(zipFile, targetDirectory); } - protected void downloadTomcat(final File catalinaDirectory, final String tomcatVersion) throws LifecycleException { + protected void downloadTomcat(final File catalinaDirectory, final String tomcatVersion, final String defaultTempDir) throws LifecycleException { String source = null; try { @@ -222,7 +222,7 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio throw new LifecycleException("Unable to find URL for Tomcat " + tomcatVersion); } - final File zipFile = Setup.downloadFile("org.apache.tomcat:tomcat:" + tomcatVersion + ":zip", source); + final File zipFile = Setup.downloadFile("org.apache.tomcat:tomcat:" + tomcatVersion + ":zip", source, defaultTempDir); Zips.unzip(zipFile, catalinaDirectory); }
