donaldp 02/05/20 22:57:14
Modified: framework/src/java/org/apache/myrmidon/framework
ExecuteTarget.java
container/src/java/org/apache/myrmidon/interfaces/embeddor
Embeddor.java
container/src/java/org/apache/myrmidon/interfaces
EmbeddedAnt.java
container/src/test/org/apache/myrmidon/components/embeddor/test
DefaultEmbeddorTest.java
container/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
Log:
No need to pass in properties when creating workspace.
Revision Changes Path
1.5 +2 -2
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java
Index: ExecuteTarget.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExecuteTarget.java 21 May 2002 05:49:13 -0000 1.4
+++ ExecuteTarget.java 21 May 2002 05:57:14 -0000 1.5
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/05/21 05:49:13 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/21 05:57:14 $
*/
public class ExecuteTarget
{
@@ -100,7 +100,7 @@
// TODO - need to be able to inherit services (TypeManager
specifically)
final Workspace workspace =
- embeddor.createWorkspace( buildParameters( context ) );
+ embeddor.createWorkspace();
final ExecutionFrame frame =
embeddor.createExecutionFrame( buildParameters( context ) );
1.16 +2 -5
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
Index: Embeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Embeddor.java 21 May 2002 05:18:38 -0000 1.15
+++ Embeddor.java 21 May 2002 05:57:14 -0000 1.16
@@ -18,7 +18,7 @@
* Interface through which you embed Myrmidon into applications.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.15 $ $Date: 2002/05/21 05:18:38 $
+ * @version $Revision: 1.16 $ $Date: 2002/05/21 05:57:14 $
*/
public interface Embeddor
{
@@ -55,13 +55,10 @@
/**
* Creates a [EMAIL PROTECTED] Workspace} that can be used to execute
projects.
*
- * @param properties The properties to define in the workspace. These
- * are added to the properties in the embeddor's
- * root execution frame.
* @return the Workspace
* @throws Exception If the workspace could not be created.
*/
- Workspace createWorkspace( Map properties )
+ Workspace createWorkspace()
throws Exception;
/**
1.10 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java
Index: EmbeddedAnt.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EmbeddedAnt.java 21 May 2002 05:32:26 -0000 1.9
+++ EmbeddedAnt.java 21 May 2002 05:57:14 -0000 1.10
@@ -42,7 +42,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.9 $ $Date: 2002/05/21 05:32:26 $
+ * @version $Revision: 1.10 $ $Date: 2002/05/21 05:57:14 $
*/
public class EmbeddedAnt
extends AbstractLogEnabled
@@ -195,7 +195,7 @@
prepareListeners( embeddor, frame );
// Create a new workspace
- final Workspace workspace = embeddor.createWorkspace(
m_workspaceProperties );
+ final Workspace workspace = embeddor.createWorkspace();
//execute the project
executeTargets( workspace, frame, project, targets );
1.14 +2 -2
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java
Index: DefaultEmbeddorTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultEmbeddorTest.java 21 May 2002 05:49:13 -0000 1.13
+++ DefaultEmbeddorTest.java 21 May 2002 05:57:14 -0000 1.14
@@ -25,7 +25,7 @@
* Test cases for the default embeddor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.13 $ $Date: 2002/05/21 05:49:13 $
+ * @version $Revision: 1.14 $ $Date: 2002/05/21 05:57:14 $
*/
public class DefaultEmbeddorTest
extends AbstractContainerTestCase
@@ -119,7 +119,7 @@
final Project project = embeddor.createProject(
projectFile.getAbsolutePath(), null, null );
// Build the workspace
- final Workspace workspace = embeddor.createWorkspace( new HashMap()
);
+ final Workspace workspace = embeddor.createWorkspace();
final ExecutionFrame frame = embeddor.createExecutionFrame( new
HashMap() );
// Install a listener
1.72 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- DefaultEmbeddor.java 21 May 2002 05:52:34 -0000 1.71
+++ DefaultEmbeddor.java 21 May 2002 05:57:14 -0000 1.72
@@ -62,7 +62,7 @@
* Instantiate this to embed inside other applications.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.71 $ $Date: 2002/05/21 05:52:34 $
+ * @version $Revision: 1.72 $ $Date: 2002/05/21 05:57:14 $
*/
public class DefaultEmbeddor
extends AbstractLogEnabled
@@ -160,7 +160,7 @@
/**
* Creates a workspace.
*/
- public Workspace createWorkspace( final Map properties )
+ public Workspace createWorkspace()
throws Exception
{
final Workspace workspace =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
