donaldp 02/04/25 02:53:32
Modified: container/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutor.java
Log:
TaskContext now needs information from TaskModel to work properly
Revision Changes Path
1.28 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AspectAwareExecutor.java 23 Apr 2002 07:35:44 -0000 1.27
+++ AspectAwareExecutor.java 25 Apr 2002 09:53:32 -0000 1.28
@@ -27,7 +27,7 @@
* the aspects helpers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.27 $ $Date: 2002/04/23 07:35:44 $
+ * @version $Revision: 1.28 $ $Date: 2002/04/25 09:53:32 $
*/
public class AspectAwareExecutor
extends DefaultExecutor
@@ -85,7 +85,7 @@
getAspectManager().postCreate( task );
debug( "contextualizing.notice", taskName );
- final TaskContext context = doCreateContext( frame );
+ final TaskContext context = doCreateContext( frame, taskModel );
doContextualize( task, taskModel, context, frame );
debug( "configuring.notice", taskName );
1.38 +6 -5
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DefaultExecutor.java 23 Apr 2002 07:44:06 -0000 1.37
+++ DefaultExecutor.java 25 Apr 2002 09:53:32 -0000 1.38
@@ -16,17 +16,17 @@
import org.apache.myrmidon.api.metadata.ModelElement;
import org.apache.myrmidon.components.workspace.DefaultTaskContext;
import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.event.TaskEventManager;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
import org.apache.myrmidon.interfaces.executor.Executor;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.apache.myrmidon.interfaces.event.TaskEventManager;
/**
* The basic executor that just executes the tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.37 $ $Date: 2002/04/23 07:44:06 $
+ * @version $Revision: 1.38 $ $Date: 2002/04/25 09:53:32 $
*/
public class DefaultExecutor
extends AbstractLogEnabled
@@ -73,7 +73,7 @@
final Task task = doCreateTask( taskName, frame );
debug( "contextualizing.notice", taskName );
- final TaskContext context = doCreateContext( frame );
+ final TaskContext context = doCreateContext( frame, taskModel );
doContextualize( task, taskModel, context, frame );
debug( "configuring.notice", taskName );
@@ -103,11 +103,12 @@
/**
* Creates a context for the task.
*/
- protected TaskContext doCreateContext( final ExecutionFrame frame )
+ protected TaskContext doCreateContext( final ExecutionFrame frame,
ModelElement taskModel )
+ throws TaskException
{
// TODO - need to deactivate the context once the task has finished
// executing
- return new DefaultTaskContext( frame );
+ return new DefaultTaskContext( frame, taskModel.getName(),
taskModel.getLocation() );
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
