donaldp 01/12/23 06:25:02
Modified: proposal/myrmidon/src/java/org/apache/antlib/core Log.java
Property.java StringToByteConverter.java
StringToClassConverter.java
StringToDoubleConverter.java
StringToFloatConverter.java
StringToIntegerConverter.java
StringToLongConverter.java
StringToShortConverter.java
StringToURLConverter.java
proposal/myrmidon/src/java/org/apache/antlib/cvslib Cvs.java
proposal/myrmidon/src/java/org/apache/antlib/runtime
ConverterDef.java Facility.java Import.java
TypeDef.java
proposal/myrmidon/src/java/org/apache/antlib/xml
XMLValidateTask.java XSLTProcess.java
Log:
Start updating logging to myrmidon style logging
Revision Changes Path
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
Index: Log.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Log.java 2001/12/23 06:24:52 1.3
+++ Log.java 2001/12/23 14:25:01 1.4
@@ -18,8 +18,7 @@
public class Log
extends AbstractTask
{
- private String m_message;
-
+ private String m_message;
public void setMessage( final String message )
{
1.3 +10 -8
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Property.java 2001/12/23 06:24:52 1.2
+++ Property.java 2001/12/23 14:25:01 1.3
@@ -11,17 +11,16 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.AbstractContainerTask;
+import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.apache.myrmidon.framework.AbstractContainerTask;
-import org.apache.myrmidon.framework.DataType;
/**
* This is the property "task" to declare a binding of a datatype to a name.
@@ -37,10 +36,10 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Property.class );
- private String m_name;
- private Object m_value;
- private boolean m_localScope = true;
- private TypeFactory m_factory;
+ private String m_name;
+ private Object m_value;
+ private boolean m_localScope = true;
+ private TypeFactory m_factory;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -48,7 +47,10 @@
super.compose( componentManager );
final TypeManager typeManager =
(TypeManager)componentManager.lookup( TypeManager.ROLE );
- try { m_factory = typeManager.getFactory( DataType.ROLE ); }
+ try
+ {
+ m_factory = typeManager.getFactory( DataType.ROLE );
+ }
catch( final TypeException te )
{
final String message = REZ.getString(
"property.bad-factory.error" );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
Index: StringToByteConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToByteConverter.java 2001/12/23 06:24:52 1.2
+++ StringToByteConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Byte( (String)object ); }
+ try
+ {
+ return new Byte( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString( "convert.bad-byte.error",
object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
Index: StringToClassConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToClassConverter.java 2001/12/23 06:24:52 1.2
+++ StringToClassConverter.java 2001/12/23 14:25:01 1.3
@@ -33,7 +33,10 @@
throws ConverterException
{
//TODO: Should we use ContextClassLoader here???
- try { return Class.forName( (String)object ); }
+ try
+ {
+ return Class.forName( (String)object );
+ }
catch( final Exception e )
{
final String message = REZ.getString( "convert.bad-class.error",
object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
Index: StringToDoubleConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToDoubleConverter.java 2001/12/23 06:24:52 1.2
+++ StringToDoubleConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Double( (String)object ); }
+ try
+ {
+ return new Double( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString(
"convert.bad-double.error", object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
Index: StringToFloatConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToFloatConverter.java 2001/12/23 06:24:52 1.2
+++ StringToFloatConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Float( (String)object ); }
+ try
+ {
+ return new Float( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString( "convert.bad-float.error",
object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
Index: StringToIntegerConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToIntegerConverter.java 2001/12/23 06:24:52 1.2
+++ StringToIntegerConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Integer( (String)object ); }
+ try
+ {
+ return new Integer( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString(
"convert.bad-integer.error", object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
Index: StringToLongConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToLongConverter.java 2001/12/23 06:24:52 1.2
+++ StringToLongConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Long( (String)object ); }
+ try
+ {
+ return new Long( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString( "convert.bad-long.error",
object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
Index: StringToShortConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToShortConverter.java 2001/12/23 06:24:52 1.2
+++ StringToShortConverter.java 2001/12/23 14:25:01 1.3
@@ -32,7 +32,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new Short( (String)object ); }
+ try
+ {
+ return new Short( (String)object );
+ }
catch( final NumberFormatException nfe )
{
final String message = REZ.getString( "convert.bad-short.error",
object );
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
Index: StringToURLConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringToURLConverter.java 2001/12/23 06:24:52 1.2
+++ StringToURLConverter.java 2001/12/23 14:25:01 1.3
@@ -34,7 +34,10 @@
public Object convert( final Object object, final Context context )
throws ConverterException
{
- try { return new URL( (String)object ); }
+ try
+ {
+ return new URL( (String)object );
+ }
catch( final MalformedURLException mue )
{
final String message = REZ.getString( "convert.bad-url.error",
object );
1.10 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
Index: Cvs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cvs.java 2001/12/23 06:24:52 1.9
+++ Cvs.java 2001/12/23 14:25:02 1.10
@@ -13,7 +13,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.EnvironmentData;
@@ -25,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfgang Werner [EMAIL
PROTECTED]</a>
- * @version $Revision: 1.9 $ $Date: 2001/12/23 06:24:52 $
+ * @version $Revision: 1.10 $ $Date: 2001/12/23 14:25:02 $
*/
public class Cvs
extends AbstractTask
1.3 +8 -9
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java
Index: ConverterDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/ConverterDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConverterDef.java 2001/12/23 06:24:52 1.2
+++ ConverterDef.java 2001/12/23 14:25:02 1.3
@@ -8,7 +8,6 @@
package org.apache.antlib.runtime;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URL;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
@@ -17,10 +16,10 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.apache.myrmidon.converter.Converter;
/**
* Task to define a converter.
@@ -34,12 +33,12 @@
private static final Resources REZ =
ResourceManager.getPackageResources( ConverterDef.class );
- private String m_sourceType;
- private String m_destinationType;
- private File m_lib;
- private String m_classname;
- private ConverterRegistry m_converterRegistry;
- private TypeManager m_typeManager;
+ private String m_sourceType;
+ private String m_destinationType;
+ private File m_lib;
+ private String m_classname;
+ private ConverterRegistry m_converterRegistry;
+ private TypeManager m_typeManager;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -97,7 +96,7 @@
m_converterRegistry.registerConverter( m_classname,
m_sourceType, m_destinationType );
final URL url = m_lib.toURL();
- final DefaultTypeFactory factory = new DefaultTypeFactory( new
URL[] { url } );
+ final DefaultTypeFactory factory = new DefaultTypeFactory( new
URL[]{url} );
factory.addNameClassMapping( m_classname, m_classname );
m_typeManager.registerType( Converter.ROLE, m_classname, factory
);
1.3 +9 -10
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
Index: Facility.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Facility.java 2001/12/23 06:24:52 1.2
+++ Facility.java 2001/12/23 14:25:02 1.3
@@ -7,9 +7,6 @@
*/
package org.apache.antlib.runtime;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentException;
@@ -18,14 +15,13 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
+import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.myrmidon.interfaces.aspect.AspectManager;
import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.apache.myrmidon.framework.AbstractContainerTask;
/**
* Task that definesMethod to register a single converter.
@@ -39,11 +35,11 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Facility.class );
- private String m_namespace;
- private AspectHandler m_aspectHandler;
+ private String m_namespace;
+ private AspectHandler m_aspectHandler;
- private AspectManager m_aspectManager;
- private TypeFactory m_factory;
+ private AspectManager m_aspectManager;
+ private TypeFactory m_factory;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -53,7 +49,10 @@
m_aspectManager = (AspectManager)componentManager.lookup(
AspectManager.ROLE );
final TypeManager typeManager =
(TypeManager)componentManager.lookup( TypeManager.ROLE );
- try { m_factory = typeManager.getFactory( AspectHandler.ROLE ); }
+ try
+ {
+ m_factory = typeManager.getFactory( AspectHandler.ROLE );
+ }
catch( final TypeException te )
{
final String message = REZ.getString(
"facility.no-factory.error" );
1.3 +3 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Import.java 2001/12/23 06:24:52 1.2
+++ Import.java 2001/12/23 14:25:02 1.3
@@ -7,11 +7,9 @@
*/
package org.apache.antlib.runtime;
+import java.io.File;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -32,8 +30,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Import.class );
- private File m_lib;
- private Deployer m_deployer;
+ private File m_lib;
+ private Deployer m_deployer;
public void compose( final ComponentManager componentManager )
throws ComponentException
1.3 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java
Index: TypeDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeDef.java 2001/12/23 06:24:52 1.2
+++ TypeDef.java 2001/12/23 14:25:02 1.3
@@ -7,7 +7,6 @@
*/
package org.apache.antlib.runtime;
-import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.framework.AbstractTypeDef;
/**
@@ -18,7 +17,7 @@
public class TypeDef
extends AbstractTypeDef
{
- private String m_type;
+ private String m_type;
public void setType( final String type )
{
1.5 +19 -21
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLValidateTask.java 2001/12/23 06:24:53 1.4
+++ XMLValidateTask.java 2001/12/23 14:25:02 1.5
@@ -252,7 +252,7 @@
if( failOnError )
throw new TaskException( errorMsg );
else
- log( errorMsg, Project.MSG_ERR );
+ getLogger().error( errorMsg );
}
}
@@ -301,19 +301,19 @@
}
catch( SAXNotRecognizedException e )
{
+ final String message = "Could not set feature '" + feature + "'
because the parser doesn't recognize it";
if( warn )
- log( "Could not set feature '"
- + feature
- + "' because the parser doesn't recognize it",
- Project.MSG_WARN );
+ {
+ getLogger().warn( message );
+ }
}
catch( SAXNotSupportedException e )
{
+ final String message = "Could not set feature '" + feature + "'
because the parser doesn't support it";
if( warn )
- log( "Could not set feature '"
- + feature
- + "' because the parser doesn't support it",
- Project.MSG_WARN );
+ {
+ getLogger().warn( message );
+ }
}
return toReturn;
}
@@ -326,7 +326,7 @@
{
try
{
- log( "Validating " + afile.getName() + "... ",
Project.MSG_VERBOSE );
+ getLogger().debug( "Validating " + afile.getName() + "... " );
errorHandler.init( afile );
InputSource is = new InputSource( new FileReader( afile ) );
String uri = "file:" + afile.getAbsolutePath().replace( '\\',
'/' );
@@ -353,7 +353,7 @@
if( failOnError )
throw new TaskException( afile + " is not a valid XML
document." );
else
- log( afile + " is not a valid XML document", Project.MSG_ERR
);
+ getLogger().error( afile + " is not a valid XML document" );
}
}
@@ -386,7 +386,7 @@
{
xmlReader = (XMLReader)readerClass.newInstance();
- log( "Using SAX2 reader " + readerClassName,
Project.MSG_VERBOSE );
+ getLogger().debug( "Using SAX2 reader " + readerClassName );
}
else
{
@@ -396,7 +396,7 @@
{
Parser parser = (Parser)readerClass.newInstance();
xmlReader = new ParserAdapter( parser );
- log( "Using SAX1 parser " + readerClassName,
Project.MSG_VERBOSE );
+ getLogger().debug( "Using SAX1 parser " +
readerClassName );
}
else
{
@@ -541,7 +541,6 @@
private void doLog( SAXParseException e, int logLevel )
{
-
log( getMessage( e ), logLevel );
}
}
@@ -570,7 +569,7 @@
if( publicId != null )
{
fileDTDs.put( publicId, fileDTD );
- log( "Mapped publicId " + publicId + " to file " +
fileDTD, Project.MSG_VERBOSE );
+ getLogger().debug( "Mapped publicId " + publicId + " to
file " + fileDTD );
}
return;
}
@@ -580,7 +579,7 @@
if( publicId != null )
{
resourceDTDs.put( publicId, location );
- log( "Mapped publicId " + publicId + " to resource " +
location, Project.MSG_VERBOSE );
+ getLogger().debug( "Mapped publicId " + publicId + " to
resource " + location );
}
}
@@ -611,7 +610,7 @@
{
try
{
- log( "Resolved " + publicId + " to local file " +
dtdFile, Project.MSG_VERBOSE );
+ getLogger().debug( "Resolved " + publicId + " to local
file " + dtdFile );
return new InputSource( new FileInputStream( dtdFile ) );
}
catch( FileNotFoundException ex )
@@ -626,7 +625,7 @@
InputStream is = this.getClass().getResourceAsStream(
dtdResourceName );
if( is != null )
{
- log( "Resolved " + publicId + " to local resource " +
dtdResourceName, Project.MSG_VERBOSE );
+ getLogger().debug( "Resolved " + publicId + " to local
resource " + dtdResourceName );
return new InputSource( is );
}
}
@@ -637,7 +636,7 @@
try
{
InputStream is = dtdUrl.openStream();
- log( "Resolved " + publicId + " to url " + dtdUrl,
Project.MSG_VERBOSE );
+ getLogger().debug( "Resolved " + publicId + " to url " +
dtdUrl );
return new InputSource( is );
}
catch( IOException ioe )
@@ -646,8 +645,7 @@
}
}
- log( "Could not resolve ( publicId: " + publicId + ", systemId:
" + systemId + ") to a local entity",
- Project.MSG_INFO );
+ getLogger().info( "Could not resolve ( publicId: " + publicId +
", systemId: " + systemId + ") to a local entity" );
return null;
}
1.5 +2 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTProcess.java 2001/12/23 06:24:53 1.4
+++ XSLTProcess.java 2001/12/23 14:25:02 1.5
@@ -13,7 +13,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
@@ -218,7 +217,7 @@
// check if liaison wants to log errors using us as logger
setupLogger( m_liaison );
- log( "Using " + m_liaison.getClass().toString(), Project.MSG_VERBOSE
);
+ getLogger().debug( "Using " + m_liaison.getClass().toString() );
File stylesheet = resolveFile( m_xslFile );
// if we have an in file and out then process them
@@ -239,7 +238,7 @@
throw new TaskException( msg );
}
scanner = getDirectoryScanner( m_baseDir );
- log( "Transforming into " + m_destDir, Project.MSG_INFO );
+ getLogger().info( "Transforming into " + m_destDir );
// Process all the files marked for styling
list = scanner.getIncludedFiles();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
