wangwei
/
antliscence
forked from youys/ant
Not watched
1
0
Fork 0
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

removed security manager 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267557 13f79535-47bb-0310-9956-ffa450edef68
master
Stefano Mazzocchi 26 years ago
parent
ee9453f4f4
commit
edb71783ad
3 changed files with 282 additions and 527 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -211
      src/main/org/apache/tools/ant/AntSecurityManager.java
  2. +111
    -145
      src/main/org/apache/tools/ant/Main.java
  3. +171
    -171
      src/main/org/apache/tools/ant/Project.java

+ 0
- 211
src/main/org/apache/tools/ant/AntSecurityManager.java View File

@@ -1,211 +0,0 @@
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 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", "Tomcat", 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 apache@apache.org.
*
* 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;

import java.security.*;
import java.io.*;
import java.net.*;

/**
* The "almost" security manager that allows everything but exit();
*
* @author stefano@apache.org
*/

public class AntSecurityManager extends SecurityManager {

private boolean exit = false;
public AntSecurityManager() {
super();
}
public void setExit(boolean allowExit) {
this.exit = allowExit;
}

public void checkExit(int status) {
if (!exit) {
throw new SecurityException("Not Allowed.");
}
}

// everything else should be allowed
/*
Removed the following interfaces as they won't compile with JDK 1.1,
and the defaults for JDK 1.2 appear to be sufficient. If you have
a problem, let me know. Sam Ruby - rubys@us.ibm.com

public void checkPermission(Permission perm) {
// allowed
}

public void checkPermission(Permission perm, Object context) {
// allowed
}
*/
public void checkCreateClassLoader() {
// allowed
}

public void checkAccess(Thread t) {
// allowed
}
public void checkAccess(ThreadGroup g) {
// allowed
}
public void checkExec(String cmd) {
// allowed
}
public void checkLink(String lib) {
// allowed
}
public void checkRead(FileDescriptor fd) {
// allowed
}

public void checkRead(String file) {
// allowed
}

public void checkRead(String file, Object context) {
// allowed
}

public void checkWrite(FileDescriptor fd) {
// allowed
}

public void checkWrite(String file) {
// allowed
}

public void checkDelete(String file) {
// allowed
}

public void checkConnect(String host, int port) {
// allowed
}

public void checkConnect(String host, int port, Object context) {
// allowed
}

public void checkListen(int port) {
// allowed
}

public void checkAccept(String host, int port) {
// allowed
}

public void checkMulticast(InetAddress maddr) {
// allowed
}

public void checkMulticast(InetAddress maddr, byte ttl) {
// allowed
}

public void checkPropertiesAccess() {
// allowed
}

public void checkPropertyAccess(String key) {
// allowed
}

public void checkPrintJobAccess() {
// allowed
}

public void checkSystemClipboardAccess() {
// allowed
}

public void checkAwtEventQueueAccess() {
// allowed
}

public void checkPackageAccess(String pkg) {
// allowed
}

public void checkPackageDefinition(String pkg) {
// allowed
}

public void checkSetFactory() {
// allowed
}

public void checkMemberAccess(Class clazz, int which) {
// allowed
}

public void checkSecurityAccess(String target) {
// allowed
}
public boolean checkTopLevelWindow(Object window) {
return true;
}
}

+ 111
- 145
src/main/org/apache/tools/ant/Main.java View File

@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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
@@ -17,15 +17,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* 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", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -50,15 +50,12 @@
* 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;

import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.util.Properties;
import java.util.Enumeration;
import java.io.*;
import java.util.*;

/**
* Command line entry point into Ant. This class is entered via the
@@ -81,19 +78,11 @@ public class Main {
/** File that we are using for configuration */
private static File buildFile = new File("build.xml");

// XXX
// Change the targets to use a vector or something. I'm not keen
// on the idea of having an artificial limit, even if it isn't
// likely that somebody will want to build more than 20 targets.
private static String targets[] = new String[20];
private static int targetCount=0;
/** The build targets */
private static Vector targets = new Vector(5);

/** Set of properties that can be used by tasks */
private static Properties definedProps = new Properties();
/** The Ant security manager */
private static AntSecurityManager securityManager;

/**
* Command line entry point. This method kicks off the building
@@ -102,99 +91,91 @@ public class Main {
*
* @param args Command line args.
*/
public static void main(String[] args) {
// cycle through given args
for (int i = 0; i < args.length; i++) {
String arg = args[i];
if (arg.equals("-help") || arg.equals("help")) {
printUsage();
return;
} else if (arg.equals("-quiet") || arg.equals("-q") ||
arg.equals("q")) {
msgOutputLevel = Project.MSG_WARN;
} else if (arg.equals("-verbose") || arg.equals("-v") ||
arg.equals("v")) {
msgOutputLevel = Project.MSG_VERBOSE;

// cycle through given args

for (int i = 0; i < args.length; i++) {
String arg = args[i];

if (arg.equals("-help") || arg.equals("help")) {
printUsage();
return;
} else if (arg.equals("-quiet") || arg.equals("-q") || arg.equals("q")) {
msgOutputLevel = Project.MSG_WARN;
} else if (arg.equals("-verbose") || arg.equals("-v") || arg.equals("v")) {
msgOutputLevel = Project.MSG_VERBOSE;
} else if (arg.equals("-buildfile") || arg.equals("-file") || arg.equals("-f")) {
try {
buildFile = new File(args[i+1]);
i++;
} catch (ArrayIndexOutOfBoundsException aioobe) {
String msg = "You must specify a buildfile when " +
"using the -buildfile argument";
System.out.println(msg);
return;
}
} else if (arg.startsWith("-D")) {
try {
buildFile = new File(args[i+1]);
i++;
} catch (ArrayIndexOutOfBoundsException aioobe) {
String msg = "You must specify a buildfile when " +
"using the -buildfile argument";
System.out.println(msg);
return;
}
} else if (arg.startsWith("-D")) {

/* Interestingly enough, we get to here when a user
* uses -Dname=value. However, the JDK goes ahead
* and parses this out to args {"-Dname", "value"}
* so instead of parsing on "=", we just make the "-D"
* characters go away and skip one argument forward.
*/

/* Interestingly enough, we get to here when a user
* uses -Dname=value. However, the JDK goes ahead
* and parses this out to args {"-Dname", "value"}
* so instead of parsing on "=", we just make the "-D"
* characters go away and skip one argument forward.
*/
String name = arg.substring(2, arg.length());
String value = args[++i];
String value = args[++i];
definedProps.put(name, value);
} else if (arg.startsWith("-")) {
// we don't have any more args to recognize!
String msg = "Unknown arg: " + arg;
System.out.println(msg);
printUsage();
return;
} else {
// if it's no other arg, it may be the target
targets[targetCount]=arg;
targetCount++;
}
}
// make sure buildfile exists
if (!buildFile.exists()) {
System.out.println("Buildfile: " + buildFile + " does not exist!");
return;
}
// make sure it's not a directory (this falls into the ultra
// paranoid lets check everything catagory
if (buildFile.isDirectory()) {
System.out.println("What? Buildfile: " + buildFile + " is a dir!");
return;
}
// we don't have any more args to recognize!
String msg = "Unknown arg: " + arg;
System.out.println(msg);
printUsage();
return;
} else {
// if it's no other arg, it may be the target
targets.addElement(arg);
}
}

// make sure buildfile exists

if (!buildFile.exists()) {
System.out.println("Buildfile: " + buildFile + " does not exist!");
return;
}

// make sure it's not a directory (this falls into the ultra
// paranoid lets check everything catagory

if (buildFile.isDirectory()) {
System.out.println("What? Buildfile: " + buildFile + " is a dir!");
return;
}

// ok, so if we've made it here, let's run the damn build allready
runBuild();
// se should force the exit() to allow everything to cleanup since
// there could be leftover threads running around (some stupid AWT code
// used for image generation does this! grrrr)
exit(0);
// ok, so if we've made it here, let's run the damn build allready
runBuild();
}

/**
* Executes the build.
*/
private static void runBuild() {

// track when we started
long startTime = System.currentTimeMillis();
if (msgOutputLevel >= Project.MSG_INFO) {
System.out.println("Buildfile: " + buildFile);
}
Project project = new Project();
project.setOutputLevel(msgOutputLevel);

// set user-define properties
long startTime = System.currentTimeMillis();
if (msgOutputLevel >= Project.MSG_INFO) {
System.out.println("Buildfile: " + buildFile);
}

Project project = new Project();
project.setOutputLevel(msgOutputLevel);

// set user-define properties
Enumeration e = definedProps.keys();
while (e.hasMoreElements()) {
String arg = (String)e.nextElement();
@@ -204,56 +185,47 @@ public class Main {

// first use the ProjectHelper to create the project object
// from the given build file.
try {
ProjectHelper.configureProject(project, buildFile);
} catch (BuildException be) {
String msg = "BUILD CONFIG ERROR: ";
System.out.println(msg + be.getMessage());
be.printStackTrace();
exit(1);
}
try {
ProjectHelper.configureProject(project, buildFile);
} catch (BuildException be) {
String msg = "BUILD CONFIG ERROR: ";
System.out.println(msg + be.getMessage());
be.printStackTrace();
System.exit(1);
}

// make sure that we have a target to execute
if (targetCount == 0) {
String target = project.getDefaultTarget();
targets[0]=target;
targetCount=1;
}

// set the security manager
securityManager = new AntSecurityManager();
System.setSecurityManager(securityManager);
if (targets.size() == 0) {
targets.addElement(project.getDefaultTarget());
}

// actually do some work
try {
for(int i=0; i< targetCount; i++)
project.executeTarget(targets[i]);
} catch (BuildException be) {
String msg = "BUILD FATAL ERROR: ";
System.out.println(msg + be.getMessage());
if (msgOutputLevel > Project.MSG_INFO) {
be.printStackTrace();
try {
Enumeration en = targets.elements();
while (en.hasMoreElements()) {
project.executeTarget((String) en.nextElement());
}
} catch (BuildException be) {
String msg = "BUILD FATAL ERROR: ";
System.out.println(msg + be.getMessage());
if (msgOutputLevel > Project.MSG_INFO) {
be.printStackTrace();
}
System.exit(1);
}
exit(1);
}

// track our stop time and let the user know how long things
// took.
long finishTime = System.currentTimeMillis();
long elapsedTime = finishTime - startTime;
if (msgOutputLevel >= Project.MSG_INFO) {
System.out.println("Completed in " + (elapsedTime/1000)
+ " seconds");
}
// track our stop time and let the user know how long things took.
long finishTime = System.currentTimeMillis();
long elapsedTime = finishTime - startTime;
if (msgOutputLevel >= Project.MSG_INFO) {
System.out.println("Completed in " + (elapsedTime/1000)
+ " seconds");
}
}

/**
* Prints the usage of how to use this class to System.out
*/
private static void printUsage() {
String lSep = System.getProperty("line.separator");
StringBuffer msg = new StringBuffer();
@@ -263,13 +235,7 @@ public class Main {
msg.append(" -quiet be extra quiet" + lSep);
msg.append(" -verbose be extra verbose" + lSep);
msg.append(" -buildfile <file> use given buildfile" + lSep);
msg.append(" -D<property>=<value> use value for given property"
+ lSep);
System.out.println(msg.toString());
}
private static void exit(int code) {
securityManager.setExit(true);
System.exit(code);
msg.append(" -D<property>=<value> use value for given property" + lSep);
System.out.println(msg.toString());
}
}

+ 171
- 171
src/main/org/apache/tools/ant/Project.java View File

@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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
@@ -17,15 +17,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* 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", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -54,18 +54,9 @@

package org.apache.tools.ant;

import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.Stack;
import java.text.StringCharacterIterator;
import java.text.CharacterIterator;
import java.io.*;
import java.util.*;
import java.text.*;

/**
* Central representation of an Ant project. This class defines a
@@ -86,12 +77,18 @@ public class Project {
public static final int MSG_INFO = 2;
public static final int MSG_VERBOSE = 3;

private static String javaVersion;
// private set of constants to represent the state
// of a DFS of the Target dependencies
private static final String VISITING = "VISITING";
private static final String VISITED = "VISITED";

private static String javaVersion;
public static final String JAVA_1_0 = "1.0";
public static final String JAVA_1_1 = "1.1";
public static final String JAVA_1_2 = "1.2";
public static final String JAVA_1_3 = "1.3";

private String name;
private PrintStream out = System.out;
private int msgOutputLevel = MSG_INFO;
@@ -105,139 +102,137 @@ public class Project {

public Project() {
detectJavaVersion();
String defs = "/org/apache/tools/ant/taskdefs/defaults.properties";
try {
Properties props = new Properties();
InputStream in = this.getClass()
.getResourceAsStream(defs);
props.load(in);
in.close();
Enumeration enum = props.propertyNames();
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
String value = props.getProperty(key);
try {
Class taskClass = Class.forName(value);
addTaskDefinition(key, taskClass);
} catch (ClassNotFoundException cnfe) {
// ignore...
}
}

Properties systemP=System.getProperties();
Enumeration e=systemP.keys();
while( e.hasMoreElements() ) {
String n=(String) e.nextElement();
properties.put( n, systemP.get(n));
}
} catch (IOException ioe) {
String msg = "Can't load default task list";
System.out.println(msg);
System.exit(1);
}
String defs = "/org/apache/tools/ant/taskdefs/defaults.properties";
try {
Properties props = new Properties();
InputStream in = this.getClass().getResourceAsStream(defs);
props.load(in);
in.close();
Enumeration enum = props.propertyNames();
while (enum.hasMoreElements()) {
String key = (String)enum.nextElement();
String value = props.getProperty(key);
try {
Class taskClass = Class.forName(value);
addTaskDefinition(key, taskClass);
} catch (ClassNotFoundException cnfe) {
// ignore...
}
}

Properties systemP=System.getProperties();
Enumeration e=systemP.keys();
while( e.hasMoreElements() ) {
String n=(String) e.nextElement();
properties.put( n, systemP.get(n));
}
} catch (IOException ioe) {
String msg = "Can't load default task list";
System.out.println(msg);
System.exit(1);
}
}
public void setOutput(PrintStream out) {
this.out = out;
this.out = out;
}

public void setOutputLevel(int msgOutputLevel) {
this.msgOutputLevel = msgOutputLevel;
this.msgOutputLevel = msgOutputLevel;
}
public int getOutputLevel() {
return this.msgOutputLevel;
return this.msgOutputLevel;
}
public void log(String msg) {
log(msg, MSG_INFO);
log(msg, MSG_INFO);
}

public void log(String msg, int msgLevel) {
if (msgLevel <= msgOutputLevel) {
out.println(msg);
}
if (msgLevel <= msgOutputLevel) {
out.println(msg);
}
}

public void log(String msg, String tag, int msgLevel) {
if (msgLevel <= msgOutputLevel) {
out.println("[" + tag + "]" + msg);
}
if (msgLevel <= msgOutputLevel) {
out.println("[" + tag + "]" + msg);
}
}

public void setProperty(String name, String value) {
// command line properties take precedence
if( null!= userProperties.get(name))
return;
// command line properties take precedence
if( null!= userProperties.get(name))
return;
log("Setting project property: " + name + " to " +
value, MSG_VERBOSE);
properties.put(name, value);
properties.put(name, value);
}

public void setUserProperty(String name, String value) {
log("Setting project property: " + name + " to " +
value, MSG_VERBOSE);
userProperties.put(name, value);
properties.put( name,value);
userProperties.put(name, value);
properties.put( name,value);
}

public String getProperty(String name) {
String property = (String)properties.get(name);
return property;
String property = (String)properties.get(name);
return property;
}

public Hashtable getProperties() {
return properties;
return properties;
}
public void setDefaultTarget(String defaultTarget) {
this.defaultTarget = defaultTarget;
this.defaultTarget = defaultTarget;
}

// deprecated, use setDefault
public String getDefaultTarget() {
return defaultTarget;
return defaultTarget;
}

// match the attribute name
public void setDefault(String defaultTarget) {
this.defaultTarget = defaultTarget;
this.defaultTarget = defaultTarget;
}

public void setName(String name) {
this.name = name;
this.name = name;
}

public String getName() {
return name;
return name;
}

// match basedir attribute in xml
public void setBasedir( String baseD ) throws BuildException {
try {
setBaseDir(new File( new File(baseD).getCanonicalPath()));
} catch (IOException ioe) {
String msg = "Can't set basedir " + baseDir + " due to " +
ioe.getMessage();
throw new BuildException(msg);
}
try {
setBaseDir(new File( new File(baseD).getCanonicalPath()));
} catch (IOException ioe) {
String msg = "Can't set basedir " + baseDir + " due to " +
ioe.getMessage();
throw new BuildException(msg);
}
}
public void setBaseDir(File baseDir) {
this.baseDir = baseDir;
String msg = "Project base dir set to: " + baseDir;
log(msg, MSG_INFO);
this.baseDir = baseDir;
String msg = "Project base dir set to: " + baseDir;
log(msg, MSG_INFO);
}

public File getBaseDir() {
if(baseDir==null) {
try {
setBasedir(".");
} catch(BuildException ex) {ex.printStackTrace();}
}
return baseDir;
if(baseDir==null) {
try {
setBasedir(".");
} catch(BuildException ex) {ex.printStackTrace();}
}
return baseDir;
}

public static String getJavaVersion() {
return javaVersion;
@@ -252,26 +247,31 @@ public class Project {
// Count up version until a NoClassDefFoundError ends the try

try {
javaVersion = "1.0";
javaVersion = JAVA_1_0;
Class.forName("java.lang.Void");
javaVersion = "1.1";
Class.forName("java.lang.ThreadLocal");
javaVersion = "1.2";
javaVersion = JAVA_1_1;
Class.forName("java.lang.ThreadLocal");
javaVersion = JAVA_1_2;
Class.forName("java.lang.StrictMath");
javaVersion = "1.3";
setProperty("ant.java.version", javaVersion);
}
catch (ClassNotFoundException cnfe) {
javaVersion = JAVA_1_3;
setProperty("ant.java.version", javaVersion);
} catch (ClassNotFoundException cnfe) {
// swallow as we've hit the max class version that
// we have
}
// sanity check
if (javaVersion == JAVA_1_0) {
throw new BuildException("Ant cannot work on Java 1.0");
}
log("Detected Java Version: " + javaVersion);
}

public void addTaskDefinition(String taskName, Class taskClass) {
String msg = " +User task: " + taskName + " " + taskClass.getName();
log(msg, MSG_VERBOSE);
taskClassDefinitions.put(taskName, taskClass);
String msg = " +User task: " + taskName + " " + taskClass.getName();
log(msg, MSG_VERBOSE);
taskClassDefinitions.put(taskName, taskClass);
}

/**
@@ -281,13 +281,13 @@ public class Project {
* @exception BuildException if the Target already exists
* in the project.
* @see Project#addOrReplaceTarget to replace existing Targets.
*/
*/
public void addTarget(Target target) {
String name = target.getName();
if (targets.get(name) != null) {
throw new BuildException("Duplicate target: `"+name+"'");
}
addOrReplaceTarget(name, target);
String name = target.getName();
if (targets.get(name) != null) {
throw new BuildException("Duplicate target: `"+name+"'");
}
addOrReplaceTarget(name, target);
}

/**
@@ -312,44 +312,44 @@ public class Project {
* the current Project.
*/
public void addOrReplaceTarget(Target target) {
addOrReplaceTarget(target.getName(), target);
addOrReplaceTarget(target.getName(), target);
}
/**
* @param target is the Target to be added/replaced in
* the current Project.
* @param targetName is the name to use for the Target
*/
public void addOrReplaceTarget(String targetName, Target target) {
String msg = " +Target: " + targetName;
log(msg, MSG_VERBOSE);
targets.put(targetName, target);
String msg = " +Target: " + targetName;
log(msg, MSG_VERBOSE);
targets.put(targetName, target);
}
public Task createTask(String taskType) throws BuildException {
Class c = (Class)taskClassDefinitions.get(taskType);

// XXX
// check for nulls, other sanity

try {
Task task = (Task)c.newInstance();
task.setProject(this);
String msg = " +Task: " + taskType;
log (msg, MSG_VERBOSE);
return task;
} catch (Exception e) {
String msg = "Could not create task of type: "
+ taskType + " due to " + e;
throw new BuildException(msg);
}
Class c = (Class)taskClassDefinitions.get(taskType);

// XXX
// check for nulls, other sanity

try {
Task task = (Task)c.newInstance();
task.setProject(this);
String msg = " +Task: " + taskType;
log (msg, MSG_VERBOSE);
return task;
} catch (Exception e) {
String msg = "Could not create task of type: "
+ taskType + " due to " + e;
throw new BuildException(msg);
}
}

public void executeTarget(String targetName) throws BuildException {

// sanity check ourselves, if we've been asked to build nothing
// then we should complain
if (targetName == null) {
String msg = "No target specified";
throw new BuildException(msg);
@@ -364,7 +364,7 @@ public class Project {

int curidx = 0;
String curtarget;
do {
curtarget = (String) sortedTargets.elementAt(curidx++);
runTarget(curtarget, targets);
@@ -372,8 +372,8 @@ public class Project {
}

public File resolveFile(String fileName) {
// deal with absolute files
if (fileName.startsWith("/")) return new File( fileName );
// deal with absolute files
if (fileName.startsWith("/")) return new File( fileName );

// Eliminate consecutive slashes after the drive spec
if (fileName.length() >= 2 &&
@@ -404,44 +404,44 @@ public class Project {
return new File(sb.toString());
}

File file = new File(baseDir.getAbsolutePath());
StringTokenizer tok = new StringTokenizer(fileName, "/", false);
while (tok.hasMoreTokens()) {
String part = tok.nextToken();
if (part.equals("..")) {
file = new File(file.getParent());
} else if (part.equals(".")) {
// Do nothing here
} else {
file = new File(file, part);
}
}
try {
return new File(file.getCanonicalPath());
}
catch (IOException e) {
log("IOException getting canonical path for " + file + ": " +
File file = new File(baseDir.getAbsolutePath());
StringTokenizer tok = new StringTokenizer(fileName, "/", false);
while (tok.hasMoreTokens()) {
String part = tok.nextToken();
if (part.equals("..")) {
file = new File(file.getParent());
} else if (part.equals(".")) {
// Do nothing here
} else {
file = new File(file, part);
}
}
try {
return new File(file.getCanonicalPath());
}
catch (IOException e) {
log("IOException getting canonical path for " + file + ": " +
e.getMessage(), MSG_ERR);
return new File(file.getAbsolutePath());
}
return new File(file.getAbsolutePath());
}
}
/**
Translate a path into its native (platform specific)
path. This should be extremely fast, code is
path. This should be extremely fast, code is
borrowed from ECS project.
<p>
All it does is translate the : into ; and / into \
All it does is translate the : into ; and / into \
if needed. In other words, it isn't perfect.
@returns translated string or empty string if to_process is null or empty
@author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
*/
public static String translatePath(String to_process) {
if ( to_process == null || to_process.length() == 0 )
return "";
StringBuffer bs = new StringBuffer(to_process.length() + 50);
StringCharacterIterator sci = new StringCharacterIterator(to_process);
String path = System.getProperty("path.separator");
@@ -449,15 +449,15 @@ public class Project {
String tmp = null;
for (char c = sci.first(); c != CharacterIterator.DONE; c = sci.next()) {
tmp = String.valueOf(c);
if (tmp.equals(":")) {
// could be a DOS drive or a Unix path separator...
// if followed by a backslash, assume it is a drive
c = sci.next();
tmp = String.valueOf(c);
bs.append( tmp.equals("\\") ? ":" : path );
if (c == CharacterIterator.DONE) break;
}
// could be a DOS drive or a Unix path separator...
// if followed by a backslash, assume it is a drive
c = sci.next();
tmp = String.valueOf(c);
bs.append( tmp.equals("\\") ? ":" : path );
if (c == CharacterIterator.DONE) break;
}

if (tmp.equals(":") || tmp.equals(";"))
tmp = path;


Write Preview
Loading…
Cancel
Save