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 06:55:59 GMT
donaldp     2002/06/10 23:55:59

  Modified:    container/src/test/org/apache/myrmidon/components/embeddor/test
                        DefaultEmbeddorTest.java
               container/src/java/org/apache/myrmidon/components/builder
                        DefaultProject.java DefaultProjectBuilder.java
               container/src/test/org/apache/myrmidon/components/builder/test
                        DefaultProjectBuilderTestCase.java
               container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
               container/src/java/org/apache/myrmidon/interfaces/oldmodel
                        Project.java
  Log:
  Move constant for default target to DefaultProject
  
  Revision  Changes    Path
  1.29      +3 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DefaultEmbeddorTest.java	11 Jun 2002 06:11:30 -0000	1.28
  +++ DefaultEmbeddorTest.java	11 Jun 2002 06:55:58 -0000	1.29
  @@ -15,6 +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.components.embeddor.DefaultEmbeddor;
   import org.apache.myrmidon.interfaces.embeddor.Embeddor;
   import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
  @@ -93,7 +94,7 @@
           //assertEquals( 0, project.getProjectNames().length );
           //assertEquals( 1, project.getTargetNames().length );
   
  -        final ModelElement implicit = project.getTarget( Project.IMPLICIT_TARGET_NAME ).getModel();
  +        final ModelElement implicit = project.getTarget( DefaultProject.IMPLICIT_TARGET_NAME
).getModel();
           assertEquals( 1, implicit.getChildCount() );
           assertEquals( "property", implicit.getChildren()[ 0 ].getName() );
   
  
  
  
  1.33      +3 -1      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- DefaultProject.java	11 Jun 2002 05:47:00 -0000	1.32
  +++ DefaultProject.java	11 Jun 2002 06:55:58 -0000	1.33
  @@ -30,6 +30,8 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultProject.class );
   
  +    public static final String IMPLICIT_TARGET_NAME = "<init>";
  +
       /**
        * The name of the default target
        */
  
  
  
  1.77      +2 -2      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.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- DefaultProjectBuilder.java	11 Jun 2002 05:47:00 -0000	1.76
  +++ DefaultProjectBuilder.java	11 Jun 2002 06:55:58 -0000	1.77
  @@ -344,7 +344,7 @@
           throws Exception
       {
           final ModelElement implicit = new ModelElement( "simple-target", model.getLocation()
);
  -        implicit.setAttribute( "name", Project.IMPLICIT_TARGET_NAME );
  +        implicit.setAttribute( "name", DefaultProject.IMPLICIT_TARGET_NAME );
   
           final ModelElement[] children = model.getChildren();
   
  
  
  
  1.21      +3 -3      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultProjectBuilderTestCase.java	11 Jun 2002 05:47:00 -0000	1.20
  +++ DefaultProjectBuilderTestCase.java	11 Jun 2002 06:55:58 -0000	1.21
  @@ -202,7 +202,7 @@
       {
           final ArrayList targetSet = new ArrayList();
           addTarget( targetSet, "main" );
  -        addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
  +        addTarget( targetSet, DefaultProject.IMPLICIT_TARGET_NAME );
           final Target[] targets =
               (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
           return targets;
  @@ -245,7 +245,7 @@
           final String uri = getURIFor( projFile );
           final ArrayList targetSet = new ArrayList();
           addTarget( targetSet, "some-target" );
  -        addTarget( targetSet, Project.IMPLICIT_TARGET_NAME );
  +        addTarget( targetSet, DefaultProject.IMPLICIT_TARGET_NAME );
           final Target[] targets =
               (Target[])targetSet.toArray( new Target[ targetSet.size() ] );
   
  
  
  
  1.84      +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.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- DefaultWorkspace.java	11 Jun 2002 06:15:29 -0000	1.83
  +++ DefaultWorkspace.java	11 Jun 2002 06:55:58 -0000	1.84
  @@ -34,6 +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;
   
   /**
    * This is the default implementation of Workspace.
  @@ -80,7 +81,7 @@
   
           // First execute the implicit target.
           Target implicitTarget =
  -            project.getTarget( Project.IMPLICIT_TARGET_NAME );
  +            project.getTarget( DefaultProject.IMPLICIT_TARGET_NAME );
           executeTarget( entry, implicitTarget );
   
           // Now execute the called target.
  @@ -124,7 +125,6 @@
               //in ServiceManager so as to support project-local call()
               // TODO - add project to properties, not services
               serviceManager.put( Workspace.ROLE, this );
  -            serviceManager.put( Project.ROLE, project );
   
               //TODO: add to
               final ExecutionFrame childFrame =
  
  
  
  1.24      +1 -6      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Project.java	11 Jun 2002 04:56:07 -0000	1.23
  +++ Project.java	11 Jun 2002 06:55:58 -0000	1.24
  @@ -21,11 +21,6 @@
    */
   public interface Project
   {
  -    /** Role name for this interface. */
  -    String ROLE = Project.class.getName();
  -
  -    String IMPLICIT_TARGET_NAME = "<init>";
  -
       /**
        * Returns the name of this project.
        */
  
  
  

--
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