Author: rmannibucau
Date: Mon Jul 9 21:51:33 2012
New Revision: 1359423
URL: http://svn.apache.org/viewvc?rev=1359423&view=rev
Log:
TOMEE-274 allowing user to set its own cache folder for artifacts retrieved
from arquillian adapters
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1359423&r1=1359422&r2=1359423&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Mon Jul 9 21:51:33 2012
@@ -108,7 +108,10 @@ public class Setup {
public static File downloadFile(final String artifactName, final String
altUrl) {
final String cache =
SystemInstance.get().getOptions().get(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER,
(String) null);
- System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER,
"target");
+ if (cache == null) { // let the user override it
+ System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER,
"target");
+ }
+
try {
final File artifact = new MavenCache().getArtifact(artifactName,
altUrl);
if (artifact == null) throw new
NullPointerException(String.format("No such artifact: %s", artifactName));
@@ -116,8 +119,6 @@ public class Setup {
} finally {
if (cache == null) {
System.clearProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
- } else {
-
System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER, cache);
}
}
}
