for Jose Alberto

sorry for the spam - get lock errors if i try too many files at once :(


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271673 13f79535-47bb-0310-9956-ffa450edef68

proposal/sandbox/antlib/build.xml

@@ -6,7 +6,6 @@
   <property name='build' location='build' />
   <property name='dist' location='dist' />
   <property name='classes' location='${build}/classes' />
-  <property name='testcases' location='src/testcases' />
 
   <property name="debug" value="true" />
   <property name="deprecation" value="false" />
@@ -20,8 +19,6 @@
       <fileset dir='${orig-classes}'>
         <include name='**' />
 	<exclude name='org/apache/tools/ant/Project.class' />
-	<exclude name='org/apache/tools/ant/ProjectHelper.class' />
-	<exclude name='org/apache/tools/ant/IntrospectionHelper.class' />
 	<exclude name='org/apache/tools/ant/TaskAdapter.class' />
 	<exclude name='org/apache/tools/ant/taskdefs/Ant.class' />
       </fileset>

proposal/sandbox/antlib/src/main/org/apache/tools/ant/opt-antlib.xml

@@ -0,0 +1,146 @@
+<?xml version='1.0' ?>
+<!--
+ * 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 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/>.
+-->
+<antlib version="1.5" >
+  <!-- Declaration of optional tasks -->
+
+  <task name="script" class="org.apache.tools.ant.taskdefs.optional.Script"/>
+  <task name="netrexxc" class="org.apache.tools.ant.taskdefs.optional.NetRexxC"/>
+  <task name="renameext" class="org.apache.tools.ant.taskdefs.optional.RenameExtensions"/>
+  <task name="ejbc" class="org.apache.tools.ant.taskdefs.optional.ejb.Ejbc"/>
+  <task name="ddcreator" class="org.apache.tools.ant.taskdefs.optional.ejb.DDCreator"/>
+  <task name="wlrun" class="org.apache.tools.ant.taskdefs.optional.ejb.WLRun"/>
+  <task name="wlstop" class="org.apache.tools.ant.taskdefs.optional.ejb.WLStop"/>
+  <task name="vssget" class="org.apache.tools.ant.taskdefs.optional.vss.MSVSSGET"/>
+  <task name="ejbjar" class="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar"/>
+  <task name="mparse" class="org.apache.tools.ant.taskdefs.optional.metamata.MParse"/>
+  <task name="mmetrics" class="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics"/>
+  <task name="maudit" class="org.apache.tools.ant.taskdefs.optional.metamata.MAudit"/>
+  <task name="junit" class="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+  <task name="cab" class="org.apache.tools.ant.taskdefs.optional.Cab"/>
+  <task name="ftp" class="org.apache.tools.ant.taskdefs.optional.net.FTP"/>
+  <task name="icontract" class="org.apache.tools.ant.taskdefs.optional.IContract"/>
+  <task name="javacc" class="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"/>
+  <task name="jjtree" class="org.apache.tools.ant.taskdefs.optional.javacc.JJTree"/>
+  <task name="stcheckout" class="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckout"/>
+  <task name="stcheckin" class="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckin"/>
+  <task name="stlabel" class="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel"/>
+  <task name="stlist" class="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamList"/>
+  <task name="wljspc" class="org.apache.tools.ant.taskdefs.optional.jsp.WLJspc"/>
+  <task name="jlink" class="org.apache.tools.ant.taskdefs.optional.jlink.JlinkTask"/>
+  <task name="native2ascii" class="org.apache.tools.ant.taskdefs.optional.Native2Ascii"/>
+  <task name="propertyfile" class="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
+  <task name="depend" class="org.apache.tools.ant.taskdefs.optional.depend.Depend"/>
+  <task name="antlr" class="org.apache.tools.ant.taskdefs.optional.ANTLR"/>
+  <task name="vajload" class="org.apache.tools.ant.taskdefs.optional.ide.VAJLoadProjects"/>
+  <task name="vajexport" class="org.apache.tools.ant.taskdefs.optional.ide.VAJExport"/>
+  <task name="vajimport" class="org.apache.tools.ant.taskdefs.optional.ide.VAJImport"/>
+  <task name="telnet" class="org.apache.tools.ant.taskdefs.optional.net.TelnetTask"/>
+  <task name="csc" class="org.apache.tools.ant.taskdefs.optional.dotnet.CSharp"/>
+  <task name="ilasm" class="org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm"/>
+  <task name="stylebook" class="org.apache.tools.ant.taskdefs.optional.StyleBook"/>
+  <task name="test" class="org.apache.tools.ant.taskdefs.optional.Test"/>
+  <task name="pvcs" class="org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs"/>
+  <task name="p4change" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Change"/>
+  <task name="p4label" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Label"/>
+  <task name="p4have" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Have"/>
+  <task name="p4sync" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync"/>
+  <task name="p4edit" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit"/>
+  <task name="p4submit" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit"/>
+  <task name="p4counter" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter"/>
+  <task name="javah" class="org.apache.tools.ant.taskdefs.optional.Javah"/>
+  <task name="ccupdate" class="org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate"/>
+  <task name="cccheckout" class="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckout"/>
+  <task name="cccheckin" class="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckin"/>
+  <task name="ccuncheckout" class="org.apache.tools.ant.taskdefs.optional.clearcase.CCUnCheckout"/>
+  <task name="sound" class="org.apache.tools.ant.taskdefs.optional.sound.SoundTask"/>
+  <task name="junitreport" class="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"/>
+  <task name="vsslabel" class="org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL"/>
+  <task name="vsshistory" class="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY"/>
+  <task name="blgenclient" class="org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient"/>
+  <task name="rpm" class="org.apache.tools.ant.taskdefs.optional.Rpm"/>
+  <task name="xmlvalidate" class="org.apache.tools.ant.taskdefs.optional.XMLValidateTask"/>
+  <task name="vsscheckin" class="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKIN"/>
+  <task name="vsscheckout" class="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKOUT"/>
+  <task name="iplanet" class="ejbc=org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask"/>
+  <task name="jdepend" class="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask"/>
+  <task name="mimemail" class="org.apache.tools.ant.taskdefs.optional.net.MimeMail"/>
+  <task name="ccmcheckin" class="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckin"/>
+  <task name="ccmcheckout" class="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckout"/>
+  <task name="ccmcheckintask" class="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckinDefault"/>
+  <task name="ccmreconfigure" class="org.apache.tools.ant.taskdefs.optional.ccm.CCMReconfigure"/>
+  <task name="ccmcreatetask" class="org.apache.tools.ant.taskdefs.optional.ccm.CCMCreateTask"/>
+  <task name="jpcoverage" class="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage"/>
+  <task name="jpcovmerge" class="org.apache.tools.ant.taskdefs.optional.sitraka.CovMerge"/>
+  <task name="jpcovreport" class="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport"/>
+  <task name="p4add" class="org.apache.tools.ant.taskdefs.optional.perforce.P4Add"/>
+  <task name="jspc" class="org.apache.tools.ant.taskdefs.optional.jsp.JspC"/>
+  <task name="replaceregexp" class="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"/>
+  <task name="translate" class="org.apache.tools.ant.taskdefs.optional.i18n.Translate"/>
+  <task name="sosget" class="org.apache.tools.ant.taskdefs.optional.sos.SOSGet"/>
+  <task name="soscheckin" class="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckin"/>
+  <task name="soscheckout" class="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckout"/>
+  <task name="soslabel" class="org.apache.tools.ant.taskdefs.optional.sos.SOSLabel"/>
+  <task name="echoproperties" class="org.apache.tools.ant.taskdefs.optional.EchoProperties"/>
+
+  <!-- I have no idea why this task is here -->
+
+  <task name="get" class="org.apache.tools.ant.taskdefs.Get"/>
+
+  <data-type name="classfileset" class="org.apache.tools.ant.types.optional.depend.ClassfileSet"/>
+
+  <!-- deprecated ant tasks (kept for back compatibility) -->
+
+  <task name="starteam" class="org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut"/>
+</antlib>

proposal/sandbox/antlib/src/main/org/apache/tools/ant/types/DataTypeAdapterTask.java

@@ -66,7 +66,6 @@ import org.apache.tools.ant.*;
 public class DataTypeAdapterTask extends Task implements RoleAdapter {
 
     Object proxy;
-    String id = null;
     
     /**
      * Checks a class, whether it is suitable to be adapted.
@@ -84,27 +83,14 @@ public class DataTypeAdapterTask extends Task implements RoleAdapter {
      * Do the execution.
      */
     public void execute() throws BuildException {
-	if (id != null) {
-	    // Need to re-register this reference
-	    // The container has register the Adapter instead
-            project.addReference(id, proxy);	    
-	}
-    }
-
-    /**
-     * Propagate configuration of Project
-     */
-    public void setProject(Project p) {
-	super.setProject(p);
-
 	// Check to see if the DataType has a setProject method to set
 	if (proxy instanceof ProjectComponent) {
-	    ((ProjectComponent)proxy).setProject(p);
+	    ((ProjectComponent)proxy).setProject(project);
 	    return;
 	}
 
 	// This may not be needed
-	// We are trying to set project even if is was not declared
+	// We are trying to set project even it is was not declared
 	// just like TaskAdapter does for beans, this is not done
 	// by the original code
         Method setProjectM = null;
@@ -113,7 +99,7 @@ public class DataTypeAdapterTask extends Task implements RoleAdapter {
             setProjectM = 
                 c.getMethod( "setProject", new Class[] {Project.class});
             if(setProjectM != null) {
-                setProjectM.invoke(proxy, new Object[] {p});
+                setProjectM.invoke(proxy, new Object[] {project});
             }
         } catch (NoSuchMethodException e) {
             // ignore this if the class being used as a task does not have
@@ -136,8 +122,4 @@ public class DataTypeAdapterTask extends Task implements RoleAdapter {
         return this.proxy ;
     }
 
-    public void setId(String id) {
-	log("Setting adapter id to: " + id, Project.MSG_DEBUG);
-	this.id = id;
-    }
 }