svn commit: r1380392 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/common-build.xml lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java

[us...@apache.org]

Author: uschindler
Date: Mon Sep  3 22:48:24 2012
New Revision: 1380392

URL: http://svn.apache.org/viewvc?rev=1380392&view=rev
Log:
Merged revision(s) 1380391 from lucene/dev/trunk:
LUCENE-4352: Only the test runner should be able to System.exit()

Added:
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java
      - copied unchanged from r1380391, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/   (props changed)

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1380392&r1=1380391&r2=1380392&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Mon Sep  3 22:48:24 2012
@@ -799,7 +799,7 @@
             <!-- Restrict access to certain Java features and install security manager: -->
             <sysproperty key="tests.sandbox.dir" value="${build.dir}" />
             <sysproperty key="clover.db.dir" value="${clover.db.dir}" />
-            <sysproperty key="java.security.manager" value="java.lang.SecurityManager" />
+            <sysproperty key="java.security.manager" value="org.apache.lucene.util.TestSecurityManager" />
             <sysproperty key="java.security.policy" value="${common.dir}/tools/junit4/tests.policy" />
 
             <sysproperty key="lucene.version" value="${dev.version}"/>