From 18b9849780a2470442ed5e3c402fff7b6a104ca9 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 6 Mar 2002 10:37:58 +0000 Subject: [PATCH] Convert Jspc to using TaskContext to log git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271770 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/jsp/JspC.java | 2 +- .../jsp/compilers/CompilerAdapter.java | 3 ++- .../jsp/compilers/CompilerAdapterFactory.java | 13 ++++++++++--- .../jsp/compilers/DefaultCompilerAdapter.java | 18 ++++++++++++++---- .../optional/jsp/compilers/JasperC.java | 3 ++- .../tools/ant/taskdefs/optional/jsp/JspC.java | 2 +- .../jsp/compilers/CompilerAdapter.java | 3 ++- .../jsp/compilers/CompilerAdapterFactory.java | 13 ++++++++++--- .../jsp/compilers/DefaultCompilerAdapter.java | 18 ++++++++++++++---- .../optional/jsp/compilers/JasperC.java | 3 ++- 10 files changed, 58 insertions(+), 20 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 13ee16c06..c2e02d180 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -383,7 +383,7 @@ public class JspC extends MatchingTask if( compileList.size() > 0 ) { CompilerAdapter adapter = - CompilerAdapterFactory.getCompiler( compiler.toString(), this ); + CompilerAdapterFactory.getCompiler( compiler.toString(), getContext() ); getLogger().info( "Compiling " + compileList.size() + " source file" + ( compileList.size() == 1 ? "" : "s" ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java index 93ab27d64..2ad9a6ac6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java @@ -8,6 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; /** @@ -23,9 +24,9 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspC; * jayglanville@home.com * @author Matthew Watson mattw@i3sp.com */ - public interface CompilerAdapter { + void setTaskContext( TaskContext context ); /** * Sets the compiler attributes, which are stored in the Jspc task. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java index 5b9c017b8..a4b9de74f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; /** * Creates the necessary compiler adapter, given basic criteria. @@ -18,7 +19,6 @@ import org.apache.myrmidon.api.TaskException; */ public class CompilerAdapterFactory { - /** * This is a singlton -- can't create instances!! */ @@ -39,12 +39,19 @@ public class CompilerAdapterFactory * * @param compilerType either the name of the desired compiler, or the full * classname of the compiler's adapter. - * @param task a task to log through. * @return The Compiler value * @throws TaskException if the compiler type could not be resolved into a * compiler adapter. */ - public static CompilerAdapter getCompiler( String compilerType, AbstractTask task ) + public static CompilerAdapter getCompiler( String compilerType, TaskContext context ) + throws TaskException + { + final CompilerAdapter adapter = createAdapter( compilerType ); + adapter.setTaskContext( context ); + return adapter; + } + + private static CompilerAdapter createAdapter( String compilerType ) throws TaskException { /* diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 92676438f..0aa034f42 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import java.util.ArrayList; import java.util.Iterator; import org.apache.avalon.excalibur.util.StringUtil; -import org.apache.avalon.framework.logger.AbstractLogEnabled; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Commandline; @@ -21,10 +21,20 @@ import org.apache.tools.ant.types.Commandline; * @author Matthew Watson mattw@i3sp.com */ public abstract class DefaultCompilerAdapter - extends AbstractLogEnabled implements CompilerAdapter { private JspC m_attributes; + private TaskContext m_taskContext; + + public void setTaskContext( final TaskContext context ) + { + m_taskContext = context; + } + + protected final TaskContext getTaskContext() + { + return m_taskContext; + } public void setJspc( final JspC attributes ) { @@ -51,7 +61,7 @@ public abstract class DefaultCompilerAdapter ArrayList compileList, Commandline cmd ) { - getLogger().debug( "Compilation args: " + cmd.toString() ); + getTaskContext().debug( "Compilation args: " + cmd.toString() ); StringBuffer niceSourceList = new StringBuffer( "File" ); if( compileList.size() != 1 ) @@ -70,7 +80,7 @@ public abstract class DefaultCompilerAdapter niceSourceList.append( " " + arg + StringUtil.LINE_SEPARATOR ); } - getLogger().debug( niceSourceList.toString() ); + getTaskContext().debug( niceSourceList.toString() ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 5e455a015..9e9c15286 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -8,6 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Argument; @@ -28,7 +29,7 @@ public class JasperC public boolean execute() throws TaskException { - getLogger().debug( "Using jasper compiler" ); + getTaskContext().debug( "Using jasper compiler" ); Commandline cmd = setupJasperCommand(); try diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 13ee16c06..c2e02d180 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -383,7 +383,7 @@ public class JspC extends MatchingTask if( compileList.size() > 0 ) { CompilerAdapter adapter = - CompilerAdapterFactory.getCompiler( compiler.toString(), this ); + CompilerAdapterFactory.getCompiler( compiler.toString(), getContext() ); getLogger().info( "Compiling " + compileList.size() + " source file" + ( compileList.size() == 1 ? "" : "s" ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java index 93ab27d64..2ad9a6ac6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java @@ -8,6 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; /** @@ -23,9 +24,9 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspC; * jayglanville@home.com * @author Matthew Watson mattw@i3sp.com */ - public interface CompilerAdapter { + void setTaskContext( TaskContext context ); /** * Sets the compiler attributes, which are stored in the Jspc task. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java index 5b9c017b8..a4b9de74f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; /** * Creates the necessary compiler adapter, given basic criteria. @@ -18,7 +19,6 @@ import org.apache.myrmidon.api.TaskException; */ public class CompilerAdapterFactory { - /** * This is a singlton -- can't create instances!! */ @@ -39,12 +39,19 @@ public class CompilerAdapterFactory * * @param compilerType either the name of the desired compiler, or the full * classname of the compiler's adapter. - * @param task a task to log through. * @return The Compiler value * @throws TaskException if the compiler type could not be resolved into a * compiler adapter. */ - public static CompilerAdapter getCompiler( String compilerType, AbstractTask task ) + public static CompilerAdapter getCompiler( String compilerType, TaskContext context ) + throws TaskException + { + final CompilerAdapter adapter = createAdapter( compilerType ); + adapter.setTaskContext( context ); + return adapter; + } + + private static CompilerAdapter createAdapter( String compilerType ) throws TaskException { /* diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 92676438f..0aa034f42 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import java.util.ArrayList; import java.util.Iterator; import org.apache.avalon.excalibur.util.StringUtil; -import org.apache.avalon.framework.logger.AbstractLogEnabled; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Commandline; @@ -21,10 +21,20 @@ import org.apache.tools.ant.types.Commandline; * @author Matthew Watson mattw@i3sp.com */ public abstract class DefaultCompilerAdapter - extends AbstractLogEnabled implements CompilerAdapter { private JspC m_attributes; + private TaskContext m_taskContext; + + public void setTaskContext( final TaskContext context ) + { + m_taskContext = context; + } + + protected final TaskContext getTaskContext() + { + return m_taskContext; + } public void setJspc( final JspC attributes ) { @@ -51,7 +61,7 @@ public abstract class DefaultCompilerAdapter ArrayList compileList, Commandline cmd ) { - getLogger().debug( "Compilation args: " + cmd.toString() ); + getTaskContext().debug( "Compilation args: " + cmd.toString() ); StringBuffer niceSourceList = new StringBuffer( "File" ); if( compileList.size() != 1 ) @@ -70,7 +80,7 @@ public abstract class DefaultCompilerAdapter niceSourceList.append( " " + arg + StringUtil.LINE_SEPARATOR ); } - getLogger().debug( niceSourceList.toString() ); + getTaskContext().debug( niceSourceList.toString() ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 5e455a015..9e9c15286 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -8,6 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.TaskContext; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Argument; @@ -28,7 +29,7 @@ public class JasperC public boolean execute() throws TaskException { - getLogger().debug( "Using jasper compiler" ); + getTaskContext().debug( "Using jasper compiler" ); Commandline cmd = setupJasperCommand(); try