From 421736ed4a52a3f068a31f53678b97915ebb0cc9 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Mon, 11 Dec 2000 00:35:20 +0000 Subject: [PATCH] Updated to latest Avalon which involved removing a lot of cruft from Ant. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268337 13f79535-47bb-0310-9956-ffa450edef68 --- proposal/myrmidon/build.xml | 6 +- proposal/myrmidon/lib/avalonapi.jar | Bin 162212 -> 180861 bytes .../Configurer.java} | 12 +- .../DefaultConfigurer.java} | 30 +- .../apache/ant/convert/ConverterEngine.java | 8 +- .../apache/ant/convert/ConverterFactory.java | 30 -- .../org/apache/ant/convert/ConverterInfo.java | 16 -- .../apache/ant/convert/ConverterLoader.java | 29 -- .../apache/ant/convert/ConverterRegistry.java | 5 +- .../ant/convert/DefaultConverterEngine.java | 38 ++- .../ant/convert/DefaultConverterFactory.java | 98 ------- .../ant/convert/DefaultConverterInfo.java | 31 +- .../ant/convert/DefaultConverterLoader.java | 47 --- .../ant/convert/DefaultConverterRegistry.java | 6 +- .../ant/convert/core/converters.properties | 8 - .../tasklet/engine/DefaultTaskletEngine.java | 63 ++-- .../tasklet/engine/DefaultTaskletFactory.java | 63 ---- .../tasklet/engine/DefaultTaskletInfo.java | 54 ---- .../tasklet/engine/DefaultTaskletLoader.java | 44 --- .../engine/DefaultTaskletRegistry.java | 20 -- .../tasklet/engine/DefaultTskDeployer.java | 269 ++++++------------ .../engine/TaskletConverterEngine.java | 10 +- .../ant/tasklet/engine/TaskletEngine.java | 12 +- .../ant/tasklet/engine/TaskletFactory.java | 24 -- .../ant/tasklet/engine/TaskletInfo.java | 36 --- .../ant/tasklet/engine/TaskletLoader.java | 30 -- .../ant/tasklet/engine/TaskletRegistry.java | 20 -- .../ant/tasklet/engine/TskDeployer.java | 6 +- .../core/AbstractResourceRegisterer.java | 1 - .../ant/tasks/core/RegisterConverter.java | 8 +- .../ant/tasks/core/RegisterTasklet.java | 6 +- .../apache/ant/tasks/core/taskdefs.properties | 11 - proposal/myrmidon/src/manifest/taskdefs.xml | 36 +++ 33 files changed, 229 insertions(+), 848 deletions(-) rename proposal/myrmidon/src/java/org/apache/ant/{tasklet/engine/TaskletConfigurer.java => configuration/Configurer.java} (69%) rename proposal/myrmidon/src/java/org/apache/ant/{tasklet/engine/DefaultTaskletConfigurer.java => configuration/DefaultConfigurer.java} (93%) delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/ConverterLoader.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterLoader.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/core/converters.properties delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletInfo.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletLoader.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletRegistry.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletInfo.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletLoader.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletRegistry.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasks/core/taskdefs.properties create mode 100644 proposal/myrmidon/src/manifest/taskdefs.xml diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index 3c929c279..3cb093e72 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -165,10 +165,8 @@ Legal: --> - - + +