git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277376 13f79535-47bb-0310-9956-ffa450edef68master
@@ -2,16 +2,16 @@ | |||||
<head> | <head> | ||||
<meta http-equiv="Content-Language" content="en-us"> | <meta http-equiv="Content-Language" content="en-us"> | ||||
<title>build.clonevm</title> | |||||
<title>ant.build.clonevm</title> | |||||
</head> | </head> | ||||
<body> | <body> | ||||
<h2><a name="clonevm">build.clonevm</a></h2> | |||||
<h2><a name="clonevm">ant.build.clonevm</a></h2> | |||||
<p><em>Since Ant 1.7</em></p> | <p><em>Since Ant 1.7</em></p> | ||||
<p>The value of the build.clonevm system property controls how Ant | |||||
<p>The value of the ant.build.clonevm system property controls how Ant | |||||
instruments forked Java Virtual Machines. The <a | instruments forked Java Virtual Machines. The <a | ||||
href="CoreTasks/java.html">java</a> and <a | href="CoreTasks/java.html">java</a> and <a | ||||
href="OptionalTasks/junit.html">junit</a> tasks support clonevm | href="OptionalTasks/junit.html">junit</a> tasks support clonevm | ||||
@@ -20,7 +20,7 @@ property applies to all forked Java VMs.</p> | |||||
<p>If the value of the property is true, then all system properties of | <p>If the value of the property is true, then all system properties of | ||||
the forked Java Virtual Machine will be the same as those of the Java | the forked Java Virtual Machine will be the same as those of the Java | ||||
VM running Ant. In addition, if you set build.clonevm to true and <a | |||||
VM running Ant. In addition, if you set ant.build.clonevm to true and <a | |||||
href="sysclasspath.html">build.sysclasspath</a> has not been set, the | href="sysclasspath.html">build.sysclasspath</a> has not been set, the | ||||
bootclasspath of forked Java VMs gets constructed as if | bootclasspath of forked Java VMs gets constructed as if | ||||
build.sysclasspath had the value "last".</p> | build.sysclasspath had the value "last".</p> | ||||
@@ -11,7 +11,7 @@ | |||||
<h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> | <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> | ||||
<h3>Concepts</h3> | <h3>Concepts</h3> | ||||
<a href="clonevm.html">build.clonevm</a><br> | |||||
<a href="clonevm.html">ant.build.clonevm</a><br> | |||||
<a href="sysclasspath.html">build.sysclasspath</a><br> | <a href="sysclasspath.html">build.sysclasspath</a><br> | ||||
<a href="CoreTasks/common.html">Common Attributes</a><br> | <a href="CoreTasks/common.html">Common Attributes</a><br> | ||||
@@ -640,7 +640,7 @@ public class CommandlineJava implements Cloneable { | |||||
/** | /** | ||||
* Calculate the bootclasspath based on the bootclasspath | * Calculate the bootclasspath based on the bootclasspath | ||||
* specified, the build.sysclasspath and build.clonevm magic | |||||
* specified, the build.sysclasspath and ant.build.clonevm magic | |||||
* properties as well as the cloneVm attribute. | * properties as well as the cloneVm attribute. | ||||
* | * | ||||
* @since Ant 1.7 | * @since Ant 1.7 | ||||
@@ -664,11 +664,13 @@ public class CommandlineJava implements Cloneable { | |||||
} | } | ||||
/** | /** | ||||
* Has the cloneVm attribute or the magic property build.clonevm been set? | |||||
* Has the cloneVm attribute or the magic property | |||||
* ant.build.clonevm been set? | |||||
* | * | ||||
* @since 1.7 | * @since 1.7 | ||||
*/ | */ | ||||
private boolean isCloneVm() { | private boolean isCloneVm() { | ||||
return cloneVm || "true".equals(System.getProperty("build.clonevm")); | |||||
return cloneVm | |||||
|| "true".equals(System.getProperty("ant.build.clonevm")); | |||||
} | } | ||||
} | } |
@@ -1,5 +1,5 @@ | |||||
/* | /* | ||||
* Copyright 2000-2004 The Apache Software Foundation | |||||
* Copyright 2000-2005 The Apache Software Foundation | |||||
* | * | ||||
* Licensed under the Apache License, Version 2.0 (the "License"); | * Licensed under the Apache License, Version 2.0 (the "License"); | ||||
* you may not use this file except in compliance with the License. | * you may not use this file except in compliance with the License. | ||||
@@ -39,15 +39,15 @@ public class CommandlineJavaTest extends TestCase { | |||||
project = new Project(); | project = new Project(); | ||||
project.setBasedir(System.getProperty("root")); | project.setBasedir(System.getProperty("root")); | ||||
project.setProperty("build.sysclasspath", "ignore"); | project.setProperty("build.sysclasspath", "ignore"); | ||||
cloneVm = System.getProperty("build.clonevm"); | |||||
cloneVm = System.getProperty("ant.build.clonevm"); | |||||
if (cloneVm != null) { | if (cloneVm != null) { | ||||
System.setProperty("build.clonevm", "false"); | |||||
System.setProperty("ant.build.clonevm", "false"); | |||||
} | } | ||||
} | } | ||||
public void tearDown() { | public void tearDown() { | ||||
if (cloneVm != null) { | if (cloneVm != null) { | ||||
System.setProperty("build.clonevm", cloneVm); | |||||
System.setProperty("ant.build.clonevm", cloneVm); | |||||
} | } | ||||
} | } | ||||