ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime ConverterDef.java
Date Sun, 09 Jun 2002 13:15:06 GMT
donaldp     2002/06/09 06:15:06

  Modified:    antlib/src/test/org/apache/antlib/runtime/test
                        ConverterDefTestConverter.java
               antlib/src/java/org/apache/antlib/runtime ConverterDef.java
  Log:
  Moved Converter architecture to excalibur
  
  Revision  Changes    Path
  1.2       +3 -3      jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/ConverterDefTestConverter.java
  
  Index: ConverterDefTestConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/ConverterDefTestConverter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConverterDefTestConverter.java	22 May 2002 07:36:21 -0000	1.1
  +++ ConverterDefTestConverter.java	9 Jun 2002 13:15:06 -0000	1.2
  @@ -7,14 +7,14 @@
    */
   package org.apache.antlib.runtime.test;
   
  -import org.apache.aut.converter.AbstractConverter;
  -import org.apache.aut.converter.ConverterException;
  +import org.apache.excalibur.converter.AbstractConverter;
  +import org.apache.excalibur.converter.ConverterException;
   
   /**
    * A test converter.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/05/22 07:36:21 $
  + * @version $Revision: 1.2 $ $Date: 2002/06/09 13:15:06 $
    */
   public class ConverterDefTestConverter
       extends AbstractConverter
  
  
  
  1.7       +5 -2      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java
  
  Index: ConverterDef.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConverterDef.java	27 May 2002 08:14:15 -0000	1.6
  +++ ConverterDef.java	9 Jun 2002 13:15:06 -0000	1.7
  @@ -9,12 +9,12 @@
   
   import java.util.HashMap;
   import java.util.Map;
  -import org.apache.aut.converter.Converter;
   import org.apache.myrmidon.framework.AbstractTypeDef;
   import org.apache.myrmidon.interfaces.deployer.Deployer;
   import org.apache.myrmidon.interfaces.deployer.TypeDefinition;
   import org.apache.myrmidon.interfaces.library.Library;
   import org.apache.myrmidon.interfaces.type.ClassLoaderTypeFactory;
  +import org.apache.excalibur.converter.Converter;
   
   /**
    * Task to define a converter.
  @@ -55,7 +55,10 @@
           final ClassLoaderTypeFactory typeFactory = new ClassLoaderTypeFactory( library.getClassLoader()
);
           typeFactory.addNameClassMapping( classname, classname );
   
  -        final TypeDefinition typeDef = new TypeDefinition( classname, Converter.ROLE, typeFactory,
attrs );
  +        final String shortName = getShortNameForRole( Converter.ROLE );
  +
  +        final TypeDefinition typeDef =
  +            new TypeDefinition( classname, shortName, typeFactory, attrs );
   
           final Deployer deployer = (Deployer)getService( Deployer.class );
           deployer.deployType( null, typeDef );
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message