bodewig 02/02/05 08:58:34
Modified: . build.xml
src/main/org/apache/tools/ant ExitException.java
Added: src/main/org/apache/tools/ant/util/optional
NoExitSecurityManager.java
Removed: src/main/org/apache/tools/ant NoExitSecurityManager.java
Log:
move NoExitSecurityManager to make Ant bootstrappable on JDK 1.1
Revision Changes Path
1.237 +1 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- build.xml 5 Feb 2002 16:13:06 -0000 1.236
+++ build.xml 5 Feb 2002 16:58:33 -0000 1.237
@@ -267,7 +267,7 @@
unless="jdk1.4+" />
<exclude name="${ant.package}/AntSecurityManager.java"
unless="jdk1.2+" />
- <exclude name="${ant.package}/NoExitSecurityManager.java"
+ <exclude name="${ant.package}/util/optional/NoExitSecurityManager.java"
unless="jdk1.2+" />
<exclude name="${ant.package}/listener/Log4jListener.java"
unless="log4j.present" />
1.3 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/ExitException.java
Index: ExitException.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ExitException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExitException.java 14 Dec 2001 23:36:17 -0000 1.2
+++ ExitException.java 5 Feb 2002 16:58:34 -0000 1.3
@@ -56,7 +56,7 @@
/**
* Used to report exit status of classes which call System.exit()
*
- * @see NoExitSecurityManager
+ * @see org.apache.tools.ant.util.optional.NoExitSecurityManager
*
* @author Conor MacNeill
*/
1.1
jakarta-ant/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
Index: NoExitSecurityManager.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.util.optional;
import org.apache.tools.ant.ExitException;
import java.security.Permission;
/**
* This is intended as a replacement for the default system manager.
* The goal is to intercept System.exit calls and make it throw an
* exception instead so that a System.exit in a task does not
* fully terminate Ant.
*
* @see ExitException
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
public class NoExitSecurityManager extends SecurityManager {
public void checkExit(int status) {
throw new ExitException(status);
}
public void checkPermission(Permission perm) {
// no permission here
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
