Browse Source

Remove some cruft to keep it compiling. The ant1 compatability layer (if it is ever implemented) will need to be rewritten anyway.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270219 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
cb2acb30f3
2 changed files with 29 additions and 46 deletions
  1. +29
    -45
      proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Project.java
  2. +0
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java

+ 29
- 45
proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Project.java View File

@@ -14,17 +14,17 @@ import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.logger.Logger;
import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.*;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;


public class Ant1Project public class Ant1Project
extends Project extends Project
implements LogEnabled, Contextualizable implements LogEnabled, Contextualizable
{ {
private Logger m_logger;
private Logger m_logger;


///Variable to hold context for use by sub-classes ///Variable to hold context for use by sub-classes
private TaskContext m_context;
private TaskContext m_context;


public void enableLogging( final Logger logger ) public void enableLogging( final Logger logger )
{ {
@@ -62,18 +62,16 @@ public class Ant1Project


public void setProperty( final String name, final String value ) public void setProperty( final String name, final String value )
{ {
try { getContext().setProperty( name, value ); }
try
{
getContext().setProperty( name, value );
}
catch( final Exception e ) catch( final Exception e )
{ {
getLogger().warn( "Failed to set property " + name + " to " + value, e ); getLogger().warn( "Failed to set property " + name + " to " + value, e );
} }
} }


public void setUserProperty( final String name, final String value )
{
setProperty( name, value );
}

public String getProperty( final String name ) public String getProperty( final String name )
{ {
return "" + getContext().getProperty( name ); return "" + getContext().getProperty( name );
@@ -103,52 +101,38 @@ public class Ant1Project


public File resolveFile( final String fileName ) public File resolveFile( final String fileName )
{ {
try { return getContext().resolveFile( fileName ); }
try
{
return getContext().resolveFile( fileName );
}
catch( final Exception e ) catch( final Exception e )
{ {
return null; return null;
} }
} }


protected void fireBuildStarted() {}
protected void fireBuildFinished(Throwable exception) {}
protected void fireTargetStarted(Target target) {}
protected void fireTargetFinished(Target target, Throwable exception) {}
protected void fireTaskStarted(Task task) {}
protected void fireTaskFinished(Task task, Throwable exception) {}

private void fireMessageLoggedEvent(BuildEvent event, String message, int priority)
{
messageLogged( message, priority );
}

protected void fireMessageLogged(Project project, String message, int priority)
{
messageLogged( message, priority );
}

protected void fireMessageLogged(Target target, String message, int priority)
{
messageLogged( message, priority );
}

protected void fireMessageLogged(Task task, String message, int priority)
{
messageLogged( message, priority );
}

private void messageLogged( String message, int priority ) private void messageLogged( String message, int priority )
{ {
switch( priority ) switch( priority )
{ {
case MSG_ERR: getLogger().error( message ); break;
case MSG_WARN: getLogger().warn( message ); break;
case MSG_INFO: getLogger().info( message ); break;
case MSG_VERBOSE: getLogger().debug( message ); break;
case MSG_DEBUG: getLogger().debug( message ); break;

default:
getLogger().debug( message );
case MSG_ERR:
getLogger().error( message );
break;
case MSG_WARN:
getLogger().warn( message );
break;
case MSG_INFO:
getLogger().info( message );
break;
case MSG_VERBOSE:
getLogger().debug( message );
break;
case MSG_DEBUG:
getLogger().debug( message );
break;

default:
getLogger().debug( message );
} }
} }
} }

+ 0
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java View File

@@ -64,7 +64,6 @@ public class TaskAdapter
getProject().init(); getProject().init();


getTask().setProject( getProject() ); getTask().setProject( getProject() );
getTask().init();
getTask().execute(); getTask().execute();
} }
catch( final Exception e ) catch( final Exception e )


Loading…
Cancel
Save