diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java index 77a2bfb93..9885861bb 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java @@ -31,7 +31,7 @@ public abstract class AbstractTypeDef extends AbstractTask implements Composable { - private String m_lib; + private File m_lib; private String m_name; private String m_className; private TypeManager m_typeManager; @@ -44,7 +44,7 @@ public abstract class AbstractTypeDef m_roleManager = (RoleManager)componentManager.lookup( RoleManager.ROLE ); } - public void setLib( final String lib ) + public void setLib( final File lib ) { //In the future this would be replaced by ClassPath sub-element m_lib = lib; @@ -92,8 +92,7 @@ public abstract class AbstractTypeDef //TODO: Make this support classpath sub-element in future try { - final File file = getContext().resolveFile( m_lib ); - final URL url = file.getCanonicalFile().toURL(); + final URL url = m_lib.toURL(); final ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java index cad5dc448..feb2ee90e 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java @@ -31,7 +31,7 @@ public class ConverterDef { private String m_sourceType; private String m_destinationType; - private String m_lib; + private File m_lib; private String m_classname; private ConverterRegistry m_converterRegistry; private TypeManager m_typeManager; @@ -43,7 +43,7 @@ public class ConverterDef m_typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE ); } - public void setLib( final String lib ) + public void setLib( final File lib ) { m_lib = lib; } @@ -83,13 +83,11 @@ public class ConverterDef throw new TaskException( "Must specify the lib parameter" ); } - final File file = getContext().resolveFile( m_lib ); - try { m_converterRegistry.registerConverter( m_classname, m_sourceType, m_destinationType ); - final URL url = file.toURL(); + final URL url = m_lib.toURL(); final DefaultTypeFactory factory = new DefaultTypeFactory( new URL[] { url } ); factory.addNameClassMapping( m_classname, m_classname );