donaldp 2002/06/12 19:59:26
Modified: container/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
container/src/test/org/apache/myrmidon/components/embeddor/test
DefaultEmbeddorTest.java
container/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
MasterProjectBuilder.java
container/src/test/org/apache/myrmidon/components/builder/test
DefaultProjectBuilderTestCase.java
container/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java ProjectEntry.java
container/src/java/org/apache/myrmidon/interfaces
EmbeddedAnt.java
container/src/java/org/apache/myrmidon/interfaces/embeddor
Embeddor.java
framework/src/java/org/apache/myrmidon/framework
ExecuteTarget.java
container/src/java/org/apache/myrmidon/interfaces/builder
ProjectBuilder.java
Added: container/src/java/org/apache/myrmidon/interfaces/model
AbstractUnit.java Project.java ProjectRef.java
Target.java
Removed: container/src/java/org/apache/myrmidon/interfaces/oldmodel
AbstractUnit.java Project.java ProjectRef.java
Target.java
Log:
Renamed
interfaces.oldmodel --> interfaces.model
back to the way it was originally before I started experimenting ;(
Revision Changes Path
1.1
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/AbstractUnit.java
Index: AbstractUnit.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.interfaces.model;
/**
* This class is abstract class that [EMAIL PROTECTED] Project}
* and [EMAIL PROTECTED] Target} extend to provide information
* about the build process.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/06/13 02:59:25 $
*/
public abstract class AbstractUnit
{
/**
* The name of unit.
*/
private final String m_name;
/**
* The description of unit.
*/
private final String m_description;
/**
* Construct unit with name and specified description.
*
* @param name the name of unit
* @param description the unit description
*/
protected AbstractUnit( final String name,
final String description )
{
if( null == name )
{
throw new NullPointerException( "name" );
}
m_name = name;
m_description = description;
}
/**
* Retrieve the name of the Target.
*
* @return the name of the Target.
*/
public String getName()
{
return m_name;
}
/**
* Retrieve a description of the target.
*
* @return a description of the target.
*/
public String getDescription()
{
return m_description;
}
}
1.11 +108 -47
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/Project.java
1.1
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/ProjectRef.java
Index: ProjectRef.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.interfaces.model;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
* A object modeling a project reference.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/06/13 02:59:25 $
*/
public class ProjectRef
{
private final String m_name;
private final ProjectDescriptor m_project;
/**
* Create a reference.
*
* @param name The local name used to refer to project
* @param project the project descriptor.
*/
public ProjectRef( final String name,
final ProjectDescriptor project )
{
m_name = name;
m_project = project;
}
/**
* @return The name of the project containing the depended-on target.
*/
public String getName()
{
return m_name;
}
/**
* Return the descriptor for project referred to.
*
* @return the descriptor for project referred to.
*/
public ProjectDescriptor getProject()
{
return m_project;
}
/**
* Return human readable string for Project reference.
*
* @return human readable string.
*/
public String toString()
{
return m_name + ": " + m_project;
}
}
1.11 +19 -34
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/Target.java
1.90 +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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- DefaultEmbeddor.java 13 Jun 2002 01:43:14 -0000 1.89
+++ DefaultEmbeddor.java 13 Jun 2002 02:59:25 -0000 1.90
@@ -49,7 +49,7 @@
import org.apache.myrmidon.interfaces.extensions.ExtensionManager;
import org.apache.myrmidon.interfaces.library.Library;
import org.apache.myrmidon.interfaces.library.LibraryManager;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.property.NameValidatorManager;
import org.apache.myrmidon.interfaces.property.PropertyResolver;
import org.apache.myrmidon.interfaces.property.PropertyStore;
1.33 +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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DefaultEmbeddorTest.java 13 Jun 2002 01:43:14 -0000 1.32
+++ DefaultEmbeddorTest.java 13 Jun 2002 02:59:25 -0000 1.33
@@ -19,7 +19,7 @@
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.event.TaskEventManager;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
1.80 +4 -4
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- DefaultProjectBuilder.java 11 Jun 2002 08:14:49 -0000 1.79
+++ DefaultProjectBuilder.java 13 Jun 2002 02:59:26 -0000 1.80
@@ -25,12 +25,12 @@
import org.apache.myrmidon.interfaces.builder.ModelBuilder;
import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
import org.apache.myrmidon.interfaces.builder.ProjectException;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
-import org.apache.myrmidon.interfaces.oldmodel.Target;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
import org.apache.myrmidon.interfaces.property.NameValidator;
import org.apache.myrmidon.interfaces.property.NameValidatorManager;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
+import org.apache.myrmidon.interfaces.model.ProjectRef;
/**
* Default implementation to construct project from a build file.
1.3 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/MasterProjectBuilder.java
Index: MasterProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/MasterProjectBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MasterProjectBuilder.java 13 Jun 2002 02:39:25 -0000 1.2
+++ MasterProjectBuilder.java 13 Jun 2002 02:59:26 -0000 1.3
@@ -17,7 +17,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
import org.apache.myrmidon.interfaces.builder.ProjectException;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.type.TypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
1.24 +5 -5
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java
Index: DefaultProjectBuilderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultProjectBuilderTestCase.java 11 Jun 2002 08:14:49 -0000
1.23
+++ DefaultProjectBuilderTestCase.java 13 Jun 2002 02:59:26 -0000
1.24
@@ -16,16 +16,16 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.myrmidon.api.metadata.ModelElement;
import org.apache.myrmidon.components.AbstractComponentTest;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.components.builder.DefaultProjectBuilder;
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
import org.apache.myrmidon.interfaces.builder.ProjectException;
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
-import org.apache.myrmidon.interfaces.oldmodel.Target;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
+import org.apache.myrmidon.interfaces.model.ProjectRef;
/**
* Test cases for [EMAIL PROTECTED] DefaultProjectBuilder}.
1.88 +4 -4
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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- DefaultWorkspace.java 11 Jun 2002 08:14:49 -0000 1.87
+++ DefaultWorkspace.java 13 Jun 2002 02:59:26 -0000 1.88
@@ -25,14 +25,14 @@
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
import org.apache.myrmidon.interfaces.executor.Executor;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
-import org.apache.myrmidon.interfaces.oldmodel.Target;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
import org.apache.myrmidon.interfaces.property.PropertyStore;
import org.apache.myrmidon.interfaces.service.ScopedService;
import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.interfaces.type.TypeRegistry;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
+import org.apache.myrmidon.interfaces.model.ProjectRef;
import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
1.13 +3 -3
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
Index: ProjectEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ProjectEntry.java 11 Jun 2002 04:47:10 -0000 1.12
+++ ProjectEntry.java 13 Jun 2002 02:59:26 -0000 1.13
@@ -10,8 +10,8 @@
import java.util.HashMap;
import java.util.Map;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
-import org.apache.myrmidon.interfaces.oldmodel.Target;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
/**
* This contains details for each project that is being executed by a
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- EmbeddedAnt.java 13 Jun 2002 01:43:15 -0000 1.24
+++ EmbeddedAnt.java 13 Jun 2002 02:59:26 -0000 1.25
@@ -24,7 +24,7 @@
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.event.TaskEventManager;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
1.24 +2 -2
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Embeddor.java 11 Jun 2002 07:45:11 -0000 1.23
+++ Embeddor.java 13 Jun 2002 02:59:26 -0000 1.24
@@ -12,7 +12,7 @@
import org.apache.myrmidon.api.event.TaskListener;
import org.apache.myrmidon.api.metadata.ModelElement;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ExecuteTarget.java 11 Jun 2002 07:45:11 -0000 1.18
+++ ExecuteTarget.java 13 Jun 2002 02:59:26 -0000 1.19
@@ -17,7 +17,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
1.17 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java
Index: ProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ProjectBuilder.java 9 Jun 2002 13:06:29 -0000 1.16
+++ ProjectBuilder.java 13 Jun 2002 02:59:26 -0000 1.17
@@ -7,7 +7,7 @@
*/
package org.apache.myrmidon.interfaces.builder;
-import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
