donaldp 2002/07/02 01:02:56
Modified: container/src/java/org/apache/myrmidon/components/context
DefaultTaskContextManager.java
container/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java
container/src/java/org/apache/myrmidon/interfaces/context
TaskContextManager.java
Log:
Pushed creation of partition context back into workspace as that is only it
is used.
Revision Changes Path
1.5 +1 -17
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/context/DefaultTaskContextManager.java
Index: DefaultTaskContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/context/DefaultTaskContextManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTaskContextManager.java 2 Jul 2002 07:44:44 -0000 1.4
+++ DefaultTaskContextManager.java 2 Jul 2002 08:02:55 -0000 1.5
@@ -7,7 +7,6 @@
*/
package org.apache.myrmidon.components.context;
-import java.io.File;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.workspace.DefaultTaskContext;
@@ -25,21 +24,6 @@
public class DefaultTaskContextManager
implements TaskContextManager
{
- public TaskContext createPartitionContext( final TaskContext context,
- final String name,
- final String location,
- final File baseDirectory )
- throws TaskException
- {
- final AntServiceKernel serviceKernel =
- (AntServiceKernel)context.getService( AntServiceKernel.class );
- return new DefaultTaskContext( name,
- "",
- location,
- baseDirectory,
- serviceKernel.createChild() );
- }
-
public TaskContext createContext( final TaskContext context,
final String name,
final String location )
1.108 +8 -5
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- DefaultWorkspace.java 2 Jul 2002 07:40:32 -0000 1.107
+++ DefaultWorkspace.java 2 Jul 2002 08:02:55 -0000 1.108
@@ -207,11 +207,14 @@
final TaskContext context )
throws TaskException
{
+ final AntServiceKernel serviceKernel =
+ (AntServiceKernel)context.getService( AntServiceKernel.class );
final TaskContext projectContext =
- m_taskContextManager.createPartitionContext( context,
- project.getName(),
-
project.getProjectDescriptor().getUri(),
-
project.getBaseDirectory() );
+ new DefaultTaskContext( project.getName(),
+ "",
+ project.getProjectDescriptor().getUri(),
+ project.getBaseDirectory(),
+ serviceKernel );
final ProjectEntry entry = new ProjectEntry( project, projectContext
);
1.3 +1 -8
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/context/TaskContextManager.java
Index: TaskContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/context/TaskContextManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TaskContextManager.java 2 Jul 2002 07:35:33 -0000 1.2
+++ TaskContextManager.java 2 Jul 2002 08:02:55 -0000 1.3
@@ -7,7 +7,6 @@
*/
package org.apache.myrmidon.interfaces.context;
-import java.io.File;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
@@ -21,12 +20,6 @@
public interface TaskContextManager
{
String ROLE = TaskContextManager.class.getName();
-
- TaskContext createPartitionContext( TaskContext context,
- String name,
- String location,
- File baseDirectory )
- throws TaskException;
TaskContext createContext( TaskContext context, String name, String
location )
throws TaskException;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
