donaldp 2002/06/10 21:47:10
Modified: container/src/java/org/apache/myrmidon/components/builder
DefaultProject.java DefaultProjectBuilder.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/oldmodel
Project.java ProjectHelper.java
container/src/test/org/apache/myrmidon/components/builder/test
DefaultProjectBuilderTestCase.java
container/src/test/org/apache/myrmidon/components/embeddor/test
DefaultEmbeddorTest.java
framework/src/java/org/apache/myrmidon/framework
ExecuteTarget.java
Removed: container/src/java/org/apache/myrmidon/components/builder
DefaultTargetMetaData.java
container/src/java/org/apache/myrmidon/interfaces/oldmodel
TargetMetaData.java
Log:
Replace TargetMetaData with Target object ...
going back to how it was when I started playing ;/
Revision Changes Path
1.30 +8 -60
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
Index: DefaultProject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DefaultProject.java 11 Jun 2002 04:02:57 -0000 1.29
+++ DefaultProject.java 11 Jun 2002 04:47:09 -0000 1.30
@@ -8,14 +8,11 @@
package org.apache.myrmidon.components.builder;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.metadata.ModelElement;
import org.apache.myrmidon.interfaces.oldmodel.Project;
-import org.apache.myrmidon.interfaces.oldmodel.TargetMetaData;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
import org.apache.myrmidon.interfaces.workspace.ProjectRef;
@@ -46,13 +43,6 @@
*/
private final File m_baseDirectory;
- /**
- * The target meta data contained by this project
- */
- private final Map m_targetMetaDataSet = new HashMap();
-
- private final DefaultTargetMetaData m_metaData;
-
private final ProjectDescriptor m_descriptor;
/**
@@ -63,14 +53,14 @@
/**
* The set of targets for this project.
*/
- private final ModelElement[] m_targets;
+ private final Target[] m_targets;
public DefaultProject( final String name,
final ProjectDescriptor descriptor,
final File baseDirectory,
final String defaultTarget,
final ProjectRef[] projectRefs,
- final ModelElement[] targets )
+ final Target[] targets )
{
if( null == defaultTarget )
{
@@ -83,14 +73,6 @@
m_defaultTarget = defaultTarget;
m_projectRefs = projectRefs;
m_targets = targets;
-
- m_metaData =
- new DefaultTargetMetaData( m_defaultTarget,
- null );
- for( int i = 0; i < m_targets.length; i++ )
- {
- addTargetMetaData( m_targets[ i ] );
- }
}
public ProjectRef[] getProjectRefs()
@@ -98,14 +80,6 @@
return m_projectRefs;
}
- private void addTargetMetaData( final ModelElement model )
- {
- final String name = model.getAttribute( "name" );
- final String description = model.getAttribute( "description" );
- final DefaultTargetMetaData metaData = new DefaultTargetMetaData(
name, description );
- m_targetMetaDataSet.put( metaData.getName(), metaData );
- }
-
public ProjectDescriptor getProjectDescriptor()
{
return m_descriptor;
@@ -148,33 +122,19 @@
/**
* Retrieve a target by name.
*/
- public final TargetMetaData getTarget( final String targetName )
- throws TaskException
- {
- final TargetMetaData target =
(TargetMetaData)m_targetMetaDataSet.get( targetName );
- if( target == null )
- {
- final String message = REZ.getString(
"project.unknown-target.error", targetName );
- throw new TaskException( message );
- }
- return target;
- }
-
- public final ModelElement getTargetModel( final String name )
+ public final Target getTarget( final String targetName )
throws TaskException
{
for( int i = 0; i < m_targets.length; i++ )
{
- final ModelElement target = m_targets[ i ];
- final String candidateName = target.getAttribute( "name", null );
- if( name.equals( candidateName ) )
+ final Target target = m_targets[ i ];
+ if( target.getName().equals( targetName ) )
{
return target;
}
}
- final String message =
- REZ.getString( "project.unknown-target.error", name );
+ final String message = REZ.getString(
"project.unknown-target.error", targetName );
throw new TaskException( message );
}
@@ -186,17 +146,5 @@
public String getProjectName()
{
return m_name;
- }
-
- /**
- * Retrieve MetaData associated with Module.
- * The primary purpose of the MetaData is to
- * enable a decent UI to run the Module.
- *
- * @return the MetaData for Module
- */
- public TargetMetaData getMetaData()
- {
- return m_metaData;
}
}
1.74 +15 -5
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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- DefaultProjectBuilder.java 11 Jun 2002 02:27:50 -0000 1.73
+++ DefaultProjectBuilder.java 11 Jun 2002 04:47:09 -0000 1.74
@@ -26,6 +26,7 @@
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.property.NameValidator;
import org.apache.myrmidon.interfaces.property.NameValidatorManager;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
@@ -139,8 +140,8 @@
final ProjectRef[] projectRefs =
(ProjectRef[])projectRefList.toArray( new ProjectRef[
projectRefList.size() ] );
- final ModelElement[] targets =
- (ModelElement[])targetList.toArray( new ModelElement[
targetList.size() ] );
+ final Target[] targets =
+ (Target[])targetList.toArray( new Target[ targetList.size()
] );
final DefaultProject project =
new DefaultProject( projectName,
@@ -181,6 +182,15 @@
// Do nothing
}
+ protected Target createTarget( final ModelElement originalModel )
+ {
+ final ModelElement model = createTargetModel( originalModel );
+ final String name = model.getAttribute( "name" );
+ final String description = model.getAttribute( "description" );
+ return new Target( name, description, model );
+ }
+
+
protected ModelElement createTargetModel( final ModelElement model )
{
return model;
@@ -373,7 +383,7 @@
if( name.equals( "target" ) )
{
- targets.add( createTargetModel( element ) );
+ targets.add( createTarget( element ) );
}
else
{
@@ -383,7 +393,7 @@
throw new ProjectException( message );
}
}
- targets.add( createTargetModel( implicit ) );
+ targets.add( createTarget( implicit ) );
}
private ProjectRef buildProjectRef( final File baseDirectory,
1.80 +6 -6
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.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- DefaultWorkspace.java 11 Jun 2002 03:58:35 -0000 1.79
+++ DefaultWorkspace.java 11 Jun 2002 04:47:09 -0000 1.80
@@ -26,7 +26,7 @@
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.TargetMetaData;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.property.PropertyStore;
import org.apache.myrmidon.interfaces.service.ScopedService;
import org.apache.myrmidon.interfaces.type.TypeManager;
@@ -78,7 +78,7 @@
{
final ProjectEntry entry = getProjectEntry( descriptor );
final Project project = entry.getProject();
- TargetMetaData target = project.getTarget( targetName );
+ Target target = project.getTarget( targetName );
if( null == target )
{
final String defaultTargetName = project.getDefaultTargetName();
@@ -250,7 +250,7 @@
* @throws TaskException if an error occurs
*/
private void executeTarget( final ProjectEntry entry,
- final TargetMetaData target )
+ final Target target )
throws TaskException
{
// Check target state, to see if it has already been executed, and
@@ -287,11 +287,11 @@
* @param target the target itself
*/
private void executeTargetNoDeps( final ProjectEntry entry,
- final TargetMetaData target )
+ final Target target )
throws TaskException
{
final ModelElement targetModel =
- entry.getProject().getTargetModel( target.getName() );
+ entry.getProject().getTarget( target.getName() ).getModel();
final ExecutionFrame frame =
entry.getFrame().createChildFrame( target.getName(), null, null,
false );
1.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProjectEntry.java 11 Jun 2002 04:02:57 -0000 1.11
+++ ProjectEntry.java 11 Jun 2002 04:47:10 -0000 1.12
@@ -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.TargetMetaData;
import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
/**
* This contains details for each project that is being executed by a
@@ -45,7 +45,7 @@
return m_frame;
}
- public TargetState getTargetState( final TargetMetaData target )
+ public TargetState getTargetState( final Target target )
{
TargetState state = (TargetState)m_targetState.get( target );
if( state == null )
@@ -55,7 +55,7 @@
return state;
}
- public void setTargetState( final TargetMetaData target, final
TargetState state )
+ public void setTargetState( final Target target, final TargetState state
)
{
m_targetState.put( target, state );
}
1.21 +5 -5
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- EmbeddedAnt.java 11 Jun 2002 04:02:57 -0000 1.20
+++ EmbeddedAnt.java 11 Jun 2002 04:47:10 -0000 1.21
@@ -19,14 +19,14 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.metadata.ModelElement;
import org.apache.myrmidon.api.event.TaskListener;
+import org.apache.myrmidon.api.metadata.ModelElement;
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.TargetMetaData;
import org.apache.myrmidon.interfaces.oldmodel.Project;
import org.apache.myrmidon.interfaces.oldmodel.ProjectHelper;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
@@ -219,7 +219,7 @@
if( targets == null || targets.length == 0 )
{
final String defaultTargetName = project.getDefaultTargetName();
- final TargetMetaData target = project.getTarget(
defaultTargetName );
+ final Target target = project.getTarget( defaultTargetName );
//Next line an utter hack - need to rejif it completely
ProjectHelper.execute( frame, getLogger(), project, target );
}
@@ -227,7 +227,7 @@
{
for( int i = 0; i < targets.length; i++ )
{
- final TargetMetaData target = project.getTarget( targets[ i
] );
+ final Target target = project.getTarget( targets[ i ] );
ProjectHelper.execute( frame, getLogger(), project, target );
}
}
1.21 +2 -14
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Project.java 11 Jun 2002 04:00:55 -0000 1.20
+++ Project.java 11 Jun 2002 04:47:10 -0000 1.21
@@ -63,10 +63,7 @@
* @return the Target
* @throws TaskException if the requested target is unknown
*/
- TargetMetaData getTarget( String name ) throws TaskException;
-
- ModelElement getTargetModel( String name )
- throws TaskException;
+ Target getTarget( String name ) throws TaskException;
/**
* Retrieve base directory of project.
@@ -74,13 +71,4 @@
* @return the projects base directory
*/
File getBaseDirectory();
-
- /**
- * Retrieve MetaData associated with Module.
- * The primary purpose of the MetaData is to
- * enable a decent UI to run the Module.
- *
- * @return the MetaData for Module
- */
- TargetMetaData getMetaData();
}
1.3 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/ProjectHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectHelper.java 11 Jun 2002 04:02:57 -0000 1.2
+++ ProjectHelper.java 11 Jun 2002 04:47:10 -0000 1.3
@@ -26,7 +26,7 @@
public static void execute( final ExecutionFrame frame,
final Logger logger,
final Project project,
- final TargetMetaData target )
+ final Target target )
throws TaskException
{
final Workspace workspace = createWorkspace( frame, logger );
1.19 +12 -12
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultProjectBuilderTestCase.java 11 Jun 2002 04:02:57 -0000
1.18
+++ DefaultProjectBuilderTestCase.java 11 Jun 2002 04:47:10 -0000
1.19
@@ -22,8 +22,8 @@
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.TargetMetaData;
import org.apache.myrmidon.interfaces.oldmodel.Project;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
import org.apache.myrmidon.interfaces.workspace.ProjectRef;
@@ -166,7 +166,7 @@
{
final ModelElement model = new ModelElement( "target", "" );
model.setAttribute( "name", name );
- targetSet.add( model );
+ targetSet.add( new Target( name, "", model ) );
}
private String getNameFor( final File projFile )
@@ -196,13 +196,13 @@
assertSameProject( expected, project );
}
- private ModelElement[] createDummyTargets()
+ private Target[] createDummyTargets()
{
final ArrayList targetSet = new ArrayList();
addTarget( targetSet, "main" );
addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
- final ModelElement[] targets =
- (ModelElement[])targetSet.toArray( new ModelElement[
targetSet.size() ] );
+ final Target[] targets =
+ (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
return targets;
}
@@ -243,8 +243,8 @@
final ArrayList targetSet = new ArrayList();
addTarget( targetSet, "some-target" );
addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
- final ModelElement[] targets =
- (ModelElement[])targetSet.toArray( new ModelElement[
targetSet.size() ] );
+ final Target[] targets =
+ (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
DefaultProject expected =
new DefaultProject( getNameFor( projFile ),
@@ -320,13 +320,13 @@
final Project project )
throws Exception
{
- assertSameMetaData( expected.getMetaData(), project.getMetaData() );
+ assertEquals( expected.getProjectName(), project.getProjectName() );
assertEquals( expected.getBaseDirectory(),
project.getBaseDirectory() );
- //assertSameMetaData( expected.getDefaultTarget(),
project.getDefaultTarget() );
+ assertEquals( expected.getDefaultTargetName(),
project.getDefaultTargetName() );
}
- private void assertSameMetaData( final TargetMetaData expected,
- final TargetMetaData actual )
+ private void assertSameTarget( final Target expected,
+ final Target actual )
{
assertEquals( expected.getName(), actual.getName() );
assertEquals( expected.getDescription(), actual.getDescription() );
1.27 +6 -6
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultEmbeddorTest.java 11 Jun 2002 04:02:57 -0000 1.26
+++ DefaultEmbeddorTest.java 11 Jun 2002 04:47:10 -0000 1.27
@@ -18,9 +18,9 @@
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
-import org.apache.myrmidon.interfaces.oldmodel.TargetMetaData;
import org.apache.myrmidon.interfaces.oldmodel.Project;
import org.apache.myrmidon.interfaces.oldmodel.ProjectHelper;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
/**
@@ -88,17 +88,17 @@
final Project project = getEmbeddor().createProject( descriptor );
// Verify the project.
- assertEquals( "test-project", project.getMetaData().getName() );
+ assertEquals( "test-project", project.getProjectName() );
//assertEquals( project.getTarget( "main-target" ),
project.getDefaultTarget() );
assertEquals( projectFile.getParentFile(),
project.getBaseDirectory() );
//assertEquals( 0, project.getProjectNames().length );
//assertEquals( 1, project.getTargetNames().length );
- final ModelElement implicit = project.getTargetModel(
Project.IMPLICIT_TARGET_NAME );
+ final ModelElement implicit = project.getTarget(
Project.IMPLICIT_TARGET_NAME ).getModel();
assertEquals( 1, implicit.getChildCount() );
assertEquals( "property", implicit.getChildren()[ 0 ].getName() );
- final ModelElement target = project.getTargetModel( "main-target" );
+ final ModelElement target = project.getTarget( "main-target"
).getModel();
assertEquals( 1, target.getChildCount() );
assertEquals( "log", target.getChildren()[ 0 ].getName() );
}
@@ -139,7 +139,7 @@
// Execute the default target
final String defaultTargetName = project.getDefaultTargetName();
- final TargetMetaData target = project.getTarget( defaultTargetName );
+ final Target target = project.getTarget( defaultTargetName );
ProjectHelper.execute( frame, getLogger(), project, target );
// Cleanup
1.16 +3 -3
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ExecuteTarget.java 11 Jun 2002 04:00:55 -0000 1.15
+++ ExecuteTarget.java 11 Jun 2002 04:47:10 -0000 1.16
@@ -17,9 +17,9 @@
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.TargetMetaData;
import org.apache.myrmidon.interfaces.oldmodel.Project;
import org.apache.myrmidon.interfaces.oldmodel.ProjectHelper;
+import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
import org.apache.myrmidon.interfaces.BasicLogger;
@@ -111,7 +111,7 @@
targetName = project.getDefaultTargetName();
}
- final TargetMetaData target = project.getTarget( targetName );
+ final Target target = project.getTarget( targetName );
try
{
// TODO - need to be able to inherit services (TypeManager
specifically)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
