darrell 02/05/08 06:40:21
Modified: ant1compat/src/conf ant-descriptor.xml
ant1compat/src/java/org/apache/tools/ant
Ant1CompatProject.java
container/src/java/org/apache/myrmidon/components/builder
ConvertingProjectBuilder.java
Log:
* Revived ant1 compatibility layer, and modified to use "ant1" namespace,
rather than prefixing all type names.
Revision Changes Path
1.2 +149 -149
jakarta-ant-myrmidon/ant1compat/src/conf/ant-descriptor.xml
Index: ant-descriptor.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/ant1compat/src/conf/ant-descriptor.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant-descriptor.xml 14 Apr 2002 12:38:40 -0000 1.1
+++ ant-descriptor.xml 8 May 2002 13:40:21 -0000 1.2
@@ -2,313 +2,313 @@
<types>
<!-- Type instance tasks -->
- <task name="ant1.path"
+ <task name="path"
classname="org.apache.tools.ant.Ant1CompatTypeInstanceTask" />
- <task name="ant1.patternset"
+ <task name="patternset"
classname="org.apache.tools.ant.Ant1CompatTypeInstanceTask" />
- <task name="ant1.filterset"
+ <task name="filterset"
classname="org.apache.tools.ant.Ant1CompatTypeInstanceTask" />
<!-- TaskAdapter tasks -->
- <task name="ant1.condition"
+ <task name="condition"
classname="org.apache.tools.ant.Ant1CompatTaskAdapter" />
<!-- Tasks specialised for myrmidon -->
- <task name="ant1.ant"
+ <task name="ant"
classname="org.apache.tools.ant.taskdefs.Ant" />
- <task name="ant1.antcall"
+ <task name="antcall"
classname="org.apache.tools.ant.taskdefs.CallTarget" />
<!-- standard ant tasks -->
- <task name="ant1.mkdir"
+ <task name="mkdir"
classname="org.apache.tools.ant.taskdefs.Mkdir" />
- <task name="ant1.javac"
+ <task name="javac"
classname="org.apache.tools.ant.taskdefs.Javac" />
- <task name="ant1.chmod"
+ <task name="chmod"
classname="org.apache.tools.ant.taskdefs.Chmod" />
- <task name="ant1.delete"
+ <task name="delete"
classname="org.apache.tools.ant.taskdefs.Delete" />
- <task name="ant1.copy"
+ <task name="copy"
classname="org.apache.tools.ant.taskdefs.Copy" />
- <task name="ant1.move"
+ <task name="move"
classname="org.apache.tools.ant.taskdefs.Move" />
- <task name="ant1.jar"
+ <task name="jar"
classname="org.apache.tools.ant.taskdefs.Jar" />
- <task name="ant1.rmic"
+ <task name="rmic"
classname="org.apache.tools.ant.taskdefs.Rmic" />
- <task name="ant1.cvs"
+ <task name="cvs"
classname="org.apache.tools.ant.taskdefs.Cvs" />
- <task name="ant1.get"
+ <task name="get"
classname="org.apache.tools.ant.taskdefs.Get" />
- <task name="ant1.unzip"
+ <task name="unzip"
classname="org.apache.tools.ant.taskdefs.Expand" />
- <task name="ant1.unjar"
+ <task name="unjar"
classname="org.apache.tools.ant.taskdefs.Expand" />
- <task name="ant1.unwar"
+ <task name="unwar"
classname="org.apache.tools.ant.taskdefs.Expand" />
- <task name="ant1.echo"
+ <task name="echo"
classname="org.apache.tools.ant.taskdefs.Echo" />
- <task name="ant1.javadoc"
+ <task name="javadoc"
classname="org.apache.tools.ant.taskdefs.Javadoc" />
- <task name="ant1.zip"
+ <task name="zip"
classname="org.apache.tools.ant.taskdefs.Zip" />
- <task name="ant1.gzip"
+ <task name="gzip"
classname="org.apache.tools.ant.taskdefs.GZip" />
- <task name="ant1.gunzip"
+ <task name="gunzip"
classname="org.apache.tools.ant.taskdefs.GUnzip" />
- <task name="ant1.replace"
+ <task name="replace"
classname="org.apache.tools.ant.taskdefs.Replace" />
- <task name="ant1.java"
+ <task name="java"
classname="org.apache.tools.ant.taskdefs.Java" />
- <task name="ant1.tstamp"
+ <task name="tstamp"
classname="org.apache.tools.ant.taskdefs.Tstamp" />
- <task name="ant1.property"
+ <task name="property"
classname="org.apache.tools.ant.taskdefs.Property" />
- <task name="ant1.taskdef"
+ <task name="taskdef"
classname="org.apache.tools.ant.taskdefs.Taskdef" />
- <task name="ant1.exec"
+ <task name="exec"
classname="org.apache.tools.ant.taskdefs.ExecTask" />
- <task name="ant1.tar"
+ <task name="tar"
classname="org.apache.tools.ant.taskdefs.Tar" />
- <task name="ant1.untar"
+ <task name="untar"
classname="org.apache.tools.ant.taskdefs.Untar" />
- <task name="ant1.available"
+ <task name="available"
classname="org.apache.tools.ant.taskdefs.Available" />
- <task name="ant1.filter"
+ <task name="filter"
classname="org.apache.tools.ant.taskdefs.Filter" />
- <task name="ant1.fixcrlf"
+ <task name="fixcrlf"
classname="org.apache.tools.ant.taskdefs.FixCRLF" />
- <task name="ant1.patch"
+ <task name="patch"
classname="org.apache.tools.ant.taskdefs.Patch" />
- <task name="ant1.style"
+ <task name="style"
classname="org.apache.tools.ant.taskdefs.XSLTProcess" />
- <task name="ant1.touch"
+ <task name="touch"
classname="org.apache.tools.ant.taskdefs.Touch" />
- <task name="ant1.signjar"
+ <task name="signjar"
classname="org.apache.tools.ant.taskdefs.SignJar" />
- <task name="ant1.genkey"
+ <task name="genkey"
classname="org.apache.tools.ant.taskdefs.GenerateKey" />
- <task name="ant1.antstructure"
+ <task name="antstructure"
classname="org.apache.tools.ant.taskdefs.AntStructure" />
- <task name="ant1.execon"
+ <task name="execon"
classname="org.apache.tools.ant.taskdefs.ExecuteOn" />
- <task name="ant1.sql"
+ <task name="sql"
classname="org.apache.tools.ant.taskdefs.SQLExec" />
- <task name="ant1.mail"
+ <task name="mail"
classname="org.apache.tools.ant.taskdefs.email.EmailTask" />
- <task name="ant1.fail"
+ <task name="fail"
classname="org.apache.tools.ant.taskdefs.Exit" />
- <task name="ant1.war"
+ <task name="war"
classname="org.apache.tools.ant.taskdefs.War" />
- <task name="ant1.uptodate"
+ <task name="uptodate"
classname="org.apache.tools.ant.taskdefs.UpToDate" />
- <task name="ant1.apply"
+ <task name="apply"
classname="org.apache.tools.ant.taskdefs.Transform" />
- <task name="ant1.record"
+ <task name="record"
classname="org.apache.tools.ant.taskdefs.Recorder" />
- <task name="ant1.cvspass"
+ <task name="cvspass"
classname="org.apache.tools.ant.taskdefs.CVSPass" />
- <task name="ant1.typedef"
+ <task name="typedef"
classname="org.apache.tools.ant.taskdefs.Typedef" />
- <task name="ant1.sleep"
+ <task name="sleep"
classname="org.apache.tools.ant.taskdefs.Sleep" />
- <task name="ant1.pathconvert"
+ <task name="pathconvert"
classname="org.apache.tools.ant.taskdefs.PathConvert" />
- <task name="ant1.ear"
+ <task name="ear"
classname="org.apache.tools.ant.taskdefs.Ear" />
- <task name="ant1.parallel"
+ <task name="parallel"
classname="org.apache.tools.ant.taskdefs.Parallel" />
- <task name="ant1.sequential"
+ <task name="sequential"
classname="org.apache.tools.ant.taskdefs.Sequential" />
- <task name="ant1.dependset"
+ <task name="dependset"
classname="org.apache.tools.ant.taskdefs.DependSet" />
- <task name="ant1.bzip2"
+ <task name="bzip2"
classname="org.apache.tools.ant.taskdefs.BZip2" />
- <task name="ant1.bunzip2"
+ <task name="bunzip2"
classname="org.apache.tools.ant.taskdefs.BUnzip2" />
- <task name="ant1.checksum"
+ <task name="checksum"
classname="org.apache.tools.ant.taskdefs.Checksum" />
- <task name="ant1.waitfor"
+ <task name="waitfor"
classname="org.apache.tools.ant.taskdefs.WaitFor" />
- <task name="ant1.input"
+ <task name="input"
classname="org.apache.tools.ant.taskdefs.Input" />
- <task name="ant1.loadfile"
+ <task name="loadfile"
classname="org.apache.tools.ant.taskdefs.LoadFile" />
- <task name="ant1.manifest"
+ <task name="manifest"
classname="org.apache.tools.ant.taskdefs.Manifest" />
- <task name="ant1.loadproperties"
+ <task name="loadproperties"
classname="org.apache.tools.ant.taskdefs.LoadProperties" />
<!-- optional tasks -->
- <task name="ant1.script"
+ <task name="script"
classname="org.apache.tools.ant.taskdefs.optional.Script" />
- <task name="ant1.netrexxc"
+ <task name="netrexxc"
classname="org.apache.tools.ant.taskdefs.optional.NetRexxC" />
- <task name="ant1.renameext"
+ <task name="renameext"
classname="org.apache.tools.ant.taskdefs.optional.RenameExtensions" />
- <task name="ant1.ejbc"
+ <task name="ejbc"
classname="org.apache.tools.ant.taskdefs.optional.ejb.Ejbc" />
- <task name="ant1.ddcreator"
+ <task name="ddcreator"
classname="org.apache.tools.ant.taskdefs.optional.ejb.DDCreator"
/>
- <task name="ant1.wlrun"
+ <task name="wlrun"
classname="org.apache.tools.ant.taskdefs.optional.ejb.WLRun" />
- <task name="ant1.wlstop"
+ <task name="wlstop"
classname="org.apache.tools.ant.taskdefs.optional.ejb.WLStop" />
- <task name="ant1.vssget"
+ <task name="vssget"
classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSGET"
/>
- <task name="ant1.ejbjar"
+ <task name="ejbjar"
classname="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar" />
- <task name="ant1.mparse"
+ <task name="mparse"
classname="org.apache.tools.ant.taskdefs.optional.metamata.MParse" />
- <task name="ant1.mmetrics"
+ <task name="mmetrics"
classname="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics" />
- <task name="ant1.maudit"
+ <task name="maudit"
classname="org.apache.tools.ant.taskdefs.optional.metamata.MAudit" />
- <task name="ant1.junit"
+ <task name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />
- <task name="ant1.cab"
+ <task name="cab"
classname="org.apache.tools.ant.taskdefs.optional.Cab" />
- <task name="ant1.ftp"
+ <task name="ftp"
classname="org.apache.tools.ant.taskdefs.optional.net.FTP" />
- <task name="ant1.icontract"
+ <task name="icontract"
classname="org.apache.tools.ant.taskdefs.optional.IContract" />
- <task name="ant1.javacc"
+ <task name="javacc"
classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
/>
- <task name="ant1.jjtree"
+ <task name="jjtree"
classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree"
/>
- <task name="ant1.stcheckout"
+ <task name="stcheckout"
classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckout" />
- <task name="ant1.stcheckin"
+ <task name="stcheckin"
classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckin" />
- <task name="ant1.stlabel"
+ <task name="stlabel"
classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel" />
- <task name="ant1.stlist"
+ <task name="stlist"
classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamList" />
- <task name="ant1.wljspc"
+ <task name="wljspc"
classname="org.apache.tools.ant.taskdefs.optional.jsp.WLJspc" />
- <task name="ant1.jlink"
+ <task name="jlink"
classname="org.apache.tools.ant.taskdefs.optional.jlink.JlinkTask" />
- <task name="ant1.native2ascii"
+ <task name="native2ascii"
classname="org.apache.tools.ant.taskdefs.optional.Native2Ascii"
/>
- <task name="ant1.propertyfile"
+ <task name="propertyfile"
classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"
/>
- <task name="ant1.depend"
+ <task name="depend"
classname="org.apache.tools.ant.taskdefs.optional.depend.Depend"
/>
- <task name="ant1.antlr"
+ <task name="antlr"
classname="org.apache.tools.ant.taskdefs.optional.ANTLR" />
- <task name="ant1.vajload"
+ <task name="vajload"
classname="org.apache.tools.ant.taskdefs.optional.ide.VAJLoadProjects" />
- <task name="ant1.vajexport"
+ <task name="vajexport"
classname="org.apache.tools.ant.taskdefs.optional.ide.VAJExport"
/>
- <task name="ant1.vajimport"
+ <task name="vajimport"
classname="org.apache.tools.ant.taskdefs.optional.ide.VAJImport"
/>
- <task name="ant1.telnet"
+ <task name="telnet"
classname="org.apache.tools.ant.taskdefs.optional.net.TelnetTask" />
- <task name="ant1.csc"
+ <task name="csc"
classname="org.apache.tools.ant.taskdefs.optional.dotnet.CSharp"
/>
- <task name="ant1.ilasm"
+ <task name="ilasm"
classname="org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm"
/>
- <task name="ant1.stylebook"
+ <task name="stylebook"
classname="org.apache.tools.ant.taskdefs.optional.StyleBook" />
- <task name="ant1.test"
+ <task name="test"
classname="org.apache.tools.ant.taskdefs.optional.Test" />
- <task name="ant1.pvcs"
+ <task name="pvcs"
classname="org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs" />
- <task name="ant1.p4change"
+ <task name="p4change"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change" />
- <task name="ant1.p4label"
+ <task name="p4label"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label" />
- <task name="ant1.p4have"
+ <task name="p4have"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have" />
- <task name="ant1.p4sync"
+ <task name="p4sync"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync" />
- <task name="ant1.p4edit"
+ <task name="p4edit"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit" />
- <task name="ant1.p4submit"
+ <task name="p4submit"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit" />
- <task name="ant1.p4counter"
+ <task name="p4counter"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter" />
- <task name="ant1.javah"
+ <task name="javah"
classname="org.apache.tools.ant.taskdefs.optional.Javah" />
- <task name="ant1.ccupdate"
+ <task name="ccupdate"
classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate" />
- <task name="ant1.cccheckout"
+ <task name="cccheckout"
classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckout" />
- <task name="ant1.cccheckin"
+ <task name="cccheckin"
classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckin" />
- <task name="ant1.ccuncheckout"
+ <task name="ccuncheckout"
classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUnCheckout" />
- <task name="ant1.sound"
+ <task name="sound"
classname="org.apache.tools.ant.taskdefs.optional.sound.SoundTask" />
- <task name="ant1.junitreport"
+ <task name="junitreport"
classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator" />
- <task name="ant1.vsslabel"
+ <task name="vsslabel"
classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL" />
- <task name="ant1.vsshistory"
+ <task name="vsshistory"
classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY" />
- <task name="ant1.blgenclient"
+ <task name="blgenclient"
classname="org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient" />
- <task name="ant1.rpm"
+ <task name="rpm"
classname="org.apache.tools.ant.taskdefs.optional.Rpm" />
- <task name="ant1.xmlvalidate"
+ <task name="xmlvalidate"
classname="org.apache.tools.ant.taskdefs.optional.XMLValidateTask" />
- <task name="ant1.vsscheckin"
+ <task name="vsscheckin"
classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKIN" />
- <task name="ant1.vsscheckout"
+ <task name="vsscheckout"
classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKOUT" />
- <task name="ant1.iplanet-ejbc"
+ <task name="iplanet-ejbc"
classname="org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask" />
- <task name="ant1.jdepend"
+ <task name="jdepend"
classname="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask" />
- <task name="ant1.mimemail"
+ <task name="mimemail"
classname="org.apache.tools.ant.taskdefs.optional.net.MimeMail"
/>
- <task name="ant1.ccmcheckin"
+ <task name="ccmcheckin"
classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckin" />
- <task name="ant1.ccmcheckout"
+ <task name="ccmcheckout"
classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckout" />
- <task name="ant1.ccmcheckintask"
+ <task name="ccmcheckintask"
classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckinDefault" />
- <task name="ant1.ccmreconfigure"
+ <task name="ccmreconfigure"
classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMReconfigure" />
- <task name="ant1.ccmcreatetask"
+ <task name="ccmcreatetask"
classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCreateTask" />
- <task name="ant1.jpcoverage"
+ <task name="jpcoverage"
classname="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage" />
- <task name="ant1.jpcovmerge"
+ <task name="jpcovmerge"
classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovMerge" />
- <task name="ant1.jpcovreport"
+ <task name="jpcovreport"
classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport" />
- <task name="ant1.p4add"
+ <task name="p4add"
classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Add" />
- <task name="ant1.jspc"
+ <task name="jspc"
classname="org.apache.tools.ant.taskdefs.optional.jsp.JspC" />
- <task name="ant1.replaceregexp"
+ <task name="replaceregexp"
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
/>
- <task name="ant1.translate"
+ <task name="translate"
classname="org.apache.tools.ant.taskdefs.optional.i18n.Translate" />
- <task name="ant1.sosget"
+ <task name="sosget"
classname="org.apache.tools.ant.taskdefs.optional.sos.SOSGet" />
- <task name="ant1.soscheckin"
+ <task name="soscheckin"
classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckin" />
- <task name="ant1.soscheckout"
+ <task name="soscheckout"
classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckout" />
- <task name="ant1.soslabel"
+ <task name="soslabel"
classname="org.apache.tools.ant.taskdefs.optional.sos.SOSLabel"
/>
- <task name="ant1.echoproperties"
+ <task name="echoproperties"
classname="org.apache.tools.ant.taskdefs.optional.EchoProperties" />
<!-- deprecated ant tasks (kept for back compatibility) -->
- <task name="ant1.starteam"
+ <task name="starteam"
classname="org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut" />
- <task name="ant1.javadoc2"
+ <task name="javadoc2"
classname="org.apache.tools.ant.taskdefs.Javadoc" />
- <task name="ant1.copydir"
+ <task name="copydir"
classname="org.apache.tools.ant.taskdefs.Copydir" />
- <task name="ant1.copyfile"
+ <task name="copyfile"
classname="org.apache.tools.ant.taskdefs.Copyfile" />
- <task name="ant1.deltree"
+ <task name="deltree"
classname="org.apache.tools.ant.taskdefs.Deltree" />
- <task name="ant1.rename"
+ <task name="rename"
classname="org.apache.tools.ant.taskdefs.Rename" />
</types>
</ant-lib>
1.4 +14 -15
jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatProject.java
Index: Ant1CompatProject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatProject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ant1CompatProject.java 28 Apr 2002 05:04:48 -0000 1.3
+++ Ant1CompatProject.java 8 May 2002 13:40:21 -0000 1.4
@@ -17,6 +17,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.HashMap;
import org.apache.aut.converter.Converter;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.api.TaskContext;
@@ -34,7 +35,7 @@
* Ant1 original, this class contains the extensions.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.3 $ $Date: 2002/04/28 05:04:48 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/08 13:40:21 $
*/
public class Ant1CompatProject
extends Project
@@ -52,7 +53,7 @@
private Set m_userProperties = new HashSet();
private TaskContext m_context;
- private TaskContext m_underlyingContext;
+ private Map m_ant1overrides = new HashMap();
/**
* Create an Ant1 project.
@@ -73,6 +74,9 @@
}
m_converter = (Converter)m_context.getService( Converter.class );
+
+ // These are properties which must be overridden for ant1 tasks.
+ m_ant1overrides.put( "java.class.path", javaclasspath );
}
/**
@@ -83,21 +87,11 @@
throws TaskException
{
// Only reset the context if it is a different instance.
- if( m_underlyingContext == context )
+ if( m_context == context )
{
return;
}
-
- // Need the underlying context for setting properties which
- // should be propogated to other Tasks.
- m_underlyingContext = context;
-
- // The main context allows Ant1 specific property overrides.
-
- //FIXME: Temporarily disable this while in transition to
ExecutionFrame
- //Subcontexts etc
- //m_context = context.createSubContext( "ant1-overrides" );
- m_context.setProperty( "java.class.path", javaclasspath );
+ m_context = context;
}
/**
@@ -381,7 +375,7 @@
{
try
{
- m_underlyingContext.setProperty( name, value );
+ m_context.setProperty( name, value );
}
catch( TaskException e )
{
@@ -400,6 +394,11 @@
*/
public String getProperty( String name )
{
+ if ( m_ant1overrides.containsKey( name ) )
+ {
+ return (String)m_ant1overrides.get( name );
+ }
+
Object value = m_context.getProperty( name );
if( value == null )
1.5 +11 -28
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ConvertingProjectBuilder.java
Index: ConvertingProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ConvertingProjectBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConvertingProjectBuilder.java 20 Apr 2002 07:32:39 -0000 1.4
+++ ConvertingProjectBuilder.java 8 May 2002 13:40:21 -0000 1.5
@@ -18,7 +18,7 @@
* configuration into a Myrmidon one.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.4 $ $Date: 2002/04/20 07:32:39 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/08 13:40:21 $
*
* @ant.type type="project-builder" name="xml"
* @ant.type type="project-builder" name="ant"
@@ -60,6 +60,13 @@
omitAttributes.add( VERSION_ATTRIBUTE );
copyAttributes( originalConfig, newConfig, omitAttributes );
+ // Add a "typelib" task for the ant1compat stuff
+ DefaultConfiguration typelibDeclaration =
+ new DefaultConfiguration( "typelib",
originalConfig.getLocation() );
+ typelibDeclaration.setAttribute( "library", "myrmidon-ant1-compat" );
+ typelibDeclaration.setAttribute( "namespace", "ant1" );
+ newConfig.addChild( typelibDeclaration );
+
// Now copy/convert the children
final Configuration[] children = originalConfig.getChildren();
for( int i = 0; i < children.length; i++ )
@@ -72,7 +79,7 @@
}
else
{
- newConfig.addChild( convertTask( child ) );
+ newConfig.addChild( child );
}
}
@@ -118,12 +125,8 @@
containerElement = unlessElement;
}
- // Now copy in converted tasks.
- final Configuration[] tasks = originalTarget.getChildren();
- for( int i = 0; i < tasks.length; i++ )
- {
- containerElement.addChild( convertTask( tasks[ i ] ) );
- }
+ // Now copy in all tasks.
+ copyChildren( originalTarget, containerElement );
return newTarget;
}
@@ -172,26 +175,6 @@
ifElement.addChild( conditionElement );
return ifElement;
- }
-
- /**
- * Converts Configuration for an Ant1 Task into a Myrmidon version.
- * @param originalTask The Ant1 Task
- * @return the converted task
- */
- private Configuration convertTask( final Configuration originalTask )
- {
- // Create a new configuration with the "ant1." prefix.
- final String newTaskName = "ant1." + originalTask.getName();
- final DefaultConfiguration newTask =
- new DefaultConfiguration( newTaskName,
originalTask.getLocation() );
-
- // Copy all attributes, elements, and value of the task.
- copyAttributes( originalTask, newTask, new HashSet() );
- copyChildren( originalTask, newTask );
- newTask.setValue( originalTask.getValue( null ) );
-
- return newTask;
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
