costin 2002/07/26 09:47:56
Added: proposal/embed/src/java/org/apache/tools/ant/taskdefs
Import.java SystemPath.java
Removed: proposal/embed/src/java/org/apache/tools/ant/tasks/optional
JXPath.java
Log:
One more try :-)
Revision Changes Path
1.1
jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/Import.java
Index: Import.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-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.taskdefs;
import org.apache.tools.ant.*;
import org.apache.tools.ant.helper.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
import java.util.Vector;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Stack;
import org.xml.sax.Locator;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
import org.xml.sax.DocumentHandler;
import org.xml.sax.Attributes;
import org.xml.sax.AttributeList;
import org.xml.sax.helpers.XMLReaderAdapter;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.AttributeListImpl;
import org.apache.tools.ant.util.JAXPUtils;
/**
* Import task.
*
* It must be 'top level'. On execution it'll read another file
* into the same Project.
*
* @author Nicola Ken Barozzi [EMAIL PROTECTED]
* @author Dominique Devienne [EMAIL PROTECTED]
* @author Costin Manolache
*/
public class Import extends Task {
String file;
public void setFile( String file ) {
// I don't think we can use File - different rules
// for relative paths.
this.file=file;
}
/**
* Initialisation routine called after handler creation
* with the element name and attributes. The attributes which
* this handler can deal with are: <code>"default"</code>,
* <code>"name"</code>, <code>"id"</code> and <code>"basedir"</code>.
*
* @param tag Name of the element which caused this handler
* to be created. Should not be <code>null</code>.
* Ignored in this implementation.
* @param attrs Attributes of the element which caused this
* handler to be created. Must not be <code>null</code>.
*
* @exception SAXParseException if an unexpected attribute is
* encountered or if the <code>"default"</code> attribute
* is missing.
*/
public void execute() throws BuildException
{
if (file == null) {
throw new BuildException("import element appears without a file
attribute");
}
ProjectHelperImpl2.AntXmlContext context;
context=(ProjectHelperImpl2.AntXmlContext)project.getReference("ant.parsing.context");
context.importlevel++;
project.log("importlevel: "+(context.importlevel-1)+" ->
"+(context.importlevel),
Project.MSG_DEBUG);
project.log("Importing file "+file+" from "+
context.buildFile.getAbsolutePath(),
Project.MSG_VERBOSE);
// Paths are relative to the build file they're imported from,
// *not* the current directory (same as entity includes).
File importedFile = new File(file);
if (!importedFile.isAbsolute()) {
importedFile = new File(context.buildFileParent, file);
}
if (!importedFile.exists()) {
throw new BuildException("Cannot find "+file+" imported from
"+
context.buildFile.getAbsolutePath());
}
// Add parent build file to the map to avoid cycles...
String parentFilename = getPath(context.buildFile);
if (!context.importedFiles.containsKey(parentFilename)) {
context.importedFiles.put(parentFilename, context.buildFile);
}
// Make sure we import the file only once
String importedFilename = getPath(importedFile);
if (context.importedFiles.containsKey(importedFilename)) {
project.log("\nSkipped already imported file:\n
"+importedFilename+"\n",
Project.MSG_WARN);
context.importlevel--;
project.log("importlevel: "+context.importlevel+" <- "+
(context.importlevel+1) ,Project.MSG_DEBUG);
return;
} else {
context.importedFiles.put(importedFilename, importedFile);
}
context.ignoreProjectTag=true;
context.helper.parse(project, importedFile, new
ProjectHelperImpl2.RootHandler(context));
context.importlevel--;
project.log("importlevel: "+context.importlevel+" <- "+
(context.importlevel+1) ,Project.MSG_DEBUG);
}
private static String getPath(File file) {
try {
return file.getCanonicalPath();
}
catch (IOException e) {
return file.getAbsolutePath();
}
}
}
1.1
jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/SystemPath.java
Index: SystemPath.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-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.taskdefs;
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.*;
import java.io.*;
import java.util.*;
import org.xml.sax.Locator;
import org.xml.sax.InputSource;
//import org.xml.sax.HandlerBase;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
import org.xml.sax.DocumentHandler;
import org.xml.sax.Attributes;
import org.xml.sax.AttributeList;
import org.xml.sax.helpers.XMLReaderAdapter;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.AttributeListImpl;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.ParserConfigurationException;
/**
* Specify a system path, to be used to load optional.jar and all
* related libraries.
*
* Using the specified path it'll try to load or reload all optional
* tasks. The typical use is:
* <pre>
* <path id="ant.deps" >
* <fileset ... />
* </path>
*
* <systemPath pathRef="ant.deps" />
*
* <junit ... />
* </pre>
*
* This requires that ant-sax2.jar is included in ant/lib.
*
* It has a single property, a reference to a <path> containing all
* the jars that you need. It'll automatically reload optional.jar
* tasks in a different (non-delegating) loader.
*
* @author Costin Manolache
*/
public class SystemPath extends Task {
public static final String SYSTEM_LOADER_REF="ant.system.loader";
public SystemPath() {
}
/** Specify which path will be used.
*/
public void setPathRef( Reference pathRef ) throws BuildException {
Path path=(Path)pathRef.getReferencedObject(project);
initSystemLoader(path);
}
/** Will prepare the class loader to allow dynamic modifications
* of the classpath. Optional tasks are loaded in a different loader.
*/
private void initSystemLoader(Path path) {
try {
if( project.getReference( SYSTEM_LOADER_REF ) != null )
return; // already done that.
// reverse loader
AntClassLoader acl=new AntClassLoader(
this.getClass().getClassLoader(), true );
acl.addLoaderPackageRoot(
"org.apache.tools.ant.taskdefs.optional");
project.addReference( SYSTEM_LOADER_REF, acl );
String list[]=path.list();
for( int i=0; i<list.length; i++ ) {
File f= new File( list[i] );
if( f.exists() ) {
acl.addPathElement(f.getAbsolutePath());
}
}
// XXX find the classpath
String antHome=project.getProperty( "ant.home" );
File optionalJar=new File( antHome + "/lib/optional.jar" );
if( optionalJar.exists() )
acl.addPathElement(optionalJar.getAbsolutePath() );
// reinit the loader for optional, if they were in /lib/
Hashtable tasks=project.getTaskDefinitions();
//System.out.println("Replacing jars" );
// reload all optional tasks in this loader.
// Some tasks weren't defined by the normal init(), since deps
were missing.
String defs =
"/org/apache/tools/ant/taskdefs/defaults.properties";
try {
Properties props = new Properties();
InputStream in = this.getClass().getResourceAsStream(defs);
if (in == null) {
throw new BuildException("Can't load default task list");
}
props.load(in);
in.close();
Enumeration enum = tasks.keys();
while( enum.hasMoreElements()) {
String key = (String) enum.nextElement();
Class c=(Class)tasks.get(key);
if( ! c.getName().startsWith(
"org.apache.tools.ant.taskdefs.optional" ))
continue;
// other classes that needs to be replaced ??
try {
Class taskClass = acl.loadClass(c.getName());
//project.addTaskDefinition(key, taskClass);
project.getTaskDefinitions().put(key, taskClass);
System.out.println("Loaded " + key + " " +
taskClass.getClassLoader() );
} catch (NoClassDefFoundError ncdfe) {
log("Could not load a dependent class ("
+ ncdfe.getMessage() + ") for task " + key,
Project.MSG_DEBUG);
} catch (ClassNotFoundException cnfe) {
log("Could not load class (" + c.getName()
+ ") for task " + key, Project.MSG_DEBUG);
} catch (Exception ex) {
ex.printStackTrace();
}
}
// Some tasks couldn't be defined on the first run
enum = props.propertyNames();
while (enum.hasMoreElements()) {
String key = (String) enum.nextElement();
String value = props.getProperty(key);
if( ! value.startsWith(
"org.apache.tools.ant.taskdefs.optional" ))
continue;
if( tasks.get( key ) != null )
continue;
// other classes that needs to be replaced ??
try {
Class taskClass = acl.loadClass(value);
//project.addTaskDefinition(key, taskClass);
project.getTaskDefinitions().put(key, taskClass);
//System.out.println("Loaded " + key + " " +
taskClass.getClassLoader() );
} catch (NoClassDefFoundError ncdfe) {
log("Could not load a dependent class ("
+ ncdfe.getMessage() + ") for task " + key,
Project.MSG_DEBUG);
} catch (ClassNotFoundException cnfe) {
log("Could not load class (" + value
+ ") for task " + key, Project.MSG_DEBUG);
} catch (Exception ex) {
ex.printStackTrace();
}
}
} catch (IOException ioe) {
throw new BuildException("Can't load default task list");
}
} catch( Exception ex ) {
ex.printStackTrace();
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
