ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel Project.java
Date Tue, 11 Jun 2002 07:12:26 GMT
donaldp     2002/06/11 00:12:26

  Modified:    container/src/test/org/apache/myrmidon/components/embeddor/test
                        DefaultEmbeddorTest.java
               container/src/java/org/apache/myrmidon/components/builder
                        DefaultProjectBuilder.java
               container/src/test/org/apache/myrmidon/components/builder/test
                        DefaultProjectBuilderTestCase.java
               container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
  Removed:     container/src/java/org/apache/myrmidon/components/builder
                        DefaultProject.java
               container/src/java/org/apache/myrmidon/interfaces/oldmodel
                        Project.java
  Log:
  Merge DefaultProject into Project interface as there is no need for interface/implementation
separation
  
  Revision  Changes    Path
  1.30      +3 -3      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DefaultEmbeddorTest.java	11 Jun 2002 06:55:58 -0000	1.29
  +++ DefaultEmbeddorTest.java	11 Jun 2002 07:12:26 -0000	1.30
  @@ -15,7 +15,7 @@
   import org.apache.myrmidon.LogMessageTracker;
   import org.apache.myrmidon.api.event.TaskListener;
   import org.apache.myrmidon.api.metadata.ModelElement;
  -import org.apache.myrmidon.components.builder.DefaultProject;
  +import org.apache.myrmidon.interfaces.oldmodel.Project;
   import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
   import org.apache.myrmidon.interfaces.embeddor.Embeddor;
   import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
  @@ -94,7 +94,7 @@
           //assertEquals( 0, project.getProjectNames().length );
           //assertEquals( 1, project.getTargetNames().length );
   
  -        final ModelElement implicit = project.getTarget( DefaultProject.IMPLICIT_TARGET_NAME
).getModel();
  +        final ModelElement implicit = project.getTarget( Project.IMPLICIT_TARGET_NAME ).getModel();
           assertEquals( 1, implicit.getChildCount() );
           assertEquals( "property", implicit.getChildren()[ 0 ].getName() );
   
  
  
  
  1.78      +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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- DefaultProjectBuilder.java	11 Jun 2002 06:55:58 -0000	1.77
  +++ DefaultProjectBuilder.java	11 Jun 2002 07:12:26 -0000	1.78
  @@ -144,8 +144,8 @@
               final Target[] targets =
                   (Target[])targetList.toArray( new Target[ targetList.size() ] );
   
  -            final DefaultProject project =
  -                new DefaultProject( projectName,
  +            final Project project =
  +                new Project( projectName,
                                       description,
                                       descriptor,
                                       baseDirectory,
  @@ -344,7 +344,7 @@
           throws Exception
       {
           final ModelElement implicit = new ModelElement( "simple-target", model.getLocation()
);
  -        implicit.setAttribute( "name", DefaultProject.IMPLICIT_TARGET_NAME );
  +        implicit.setAttribute( "name", Project.IMPLICIT_TARGET_NAME );
   
           final ModelElement[] children = model.getChildren();
   
  
  
  
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DefaultProjectBuilderTestCase.java	11 Jun 2002 06:55:58 -0000	1.21
  +++ DefaultProjectBuilderTestCase.java	11 Jun 2002 07:12:26 -0000	1.22
  @@ -16,7 +16,7 @@
   import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.myrmidon.api.metadata.ModelElement;
   import org.apache.myrmidon.components.AbstractComponentTest;
  -import org.apache.myrmidon.components.builder.DefaultProject;
  +import org.apache.myrmidon.interfaces.oldmodel.Project;
   import org.apache.myrmidon.components.builder.DefaultProjectBuilder;
   import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
   import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
  @@ -136,8 +136,8 @@
   
           // Compare against expected project
           final String uri = getURIFor( projFile );
  -        final DefaultProject expected =
  -            new DefaultProject( getNameFor( projFile ),
  +        final Project expected =
  +            new Project( getNameFor( projFile ),
                                   "",
                                   new ProjectDescriptor( uri ),
                                   getTestDirectory(),
  @@ -187,8 +187,8 @@
           // Compare against expected project
           final String uri = getURIFor( projFile );
   
  -        final DefaultProject expected =
  -            new DefaultProject( "some-project",
  +        final Project expected =
  +            new Project( "some-project",
                                   "",
                                   new ProjectDescriptor( uri ),
                                   getTestDirectory(),
  @@ -202,7 +202,7 @@
       {
           final ArrayList targetSet = new ArrayList();
           addTarget( targetSet, "main" );
  -        addTarget( targetSet, DefaultProject.IMPLICIT_TARGET_NAME );
  +        addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
           final Target[] targets =
               (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
           return targets;
  @@ -221,8 +221,8 @@
           final File baseDir = getTestDirectory( "other-base-dir" );
           final String uri = getURIFor( projFile );
   
  -        final DefaultProject expected =
  -            new DefaultProject( getNameFor( projFile ),
  +        final Project expected =
  +            new Project( getNameFor( projFile ),
                                   "",
                                   new ProjectDescriptor( uri ),
                                   baseDir,
  @@ -245,12 +245,12 @@
           final String uri = getURIFor( projFile );
           final ArrayList targetSet = new ArrayList();
           addTarget( targetSet, "some-target" );
  -        addTarget( targetSet, DefaultProject.IMPLICIT_TARGET_NAME );
  +        addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
           final Target[] targets =
               (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
   
  -        DefaultProject expected =
  -            new DefaultProject( getNameFor( projFile ),
  +        Project expected =
  +            new Project( getNameFor( projFile ),
                                   "",
                                   new ProjectDescriptor( uri ),
                                   getTestDirectory(),
  
  
  
  1.85      +3 -3      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.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- DefaultWorkspace.java	11 Jun 2002 06:55:58 -0000	1.84
  +++ DefaultWorkspace.java	11 Jun 2002 07:12:26 -0000	1.85
  @@ -34,7 +34,7 @@
   import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
   import org.apache.myrmidon.interfaces.workspace.ProjectRef;
   import org.apache.myrmidon.interfaces.workspace.Workspace;
  -import org.apache.myrmidon.components.builder.DefaultProject;
  +import org.apache.myrmidon.interfaces.oldmodel.Project;
   
   /**
    * This is the default implementation of Workspace.
  @@ -81,7 +81,7 @@
   
           // First execute the implicit target.
           Target implicitTarget =
  -            project.getTarget( DefaultProject.IMPLICIT_TARGET_NAME );
  +            project.getTarget( Project.IMPLICIT_TARGET_NAME );
           executeTarget( entry, implicitTarget );
   
           // Now execute the called target.
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message