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/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb GenericDeploymentTool.java
Date Sun, 16 Dec 2001 03:10:44 GMT
donaldp     01/12/15 19:10:44

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant Project.java
                        ProjectHelper.java UnknownElement.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Get.java Tstamp.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        GenericDeploymentTool.java
  Log:
  Remove location data from tasks as that is a concern of the container and not the tasks.
  
  Revision  Changes    Path
  1.3       +1 -26     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Project.java	2001/12/15 14:55:54	1.2
  +++ Project.java	2001/12/16 03:10:44	1.3
  @@ -697,7 +697,7 @@
               {
                   log( "Trying to override old definition of task " + taskName,
                        MSG_WARN );
  -                invalidateCreatedTasks( taskName );
  +
               }
           }
   
  @@ -1309,31 +1309,6 @@
           {
               BuildListener listener = (BuildListener)listeners.elementAt( i );
               listener.messageLogged( event );
  -        }
  -    }
  -
  -    /**
  -     * Mark tasks as invalid which no longer are of the correct type for a given
  -     * taskname.
  -     *
  -     * @param type Description of Parameter
  -     */
  -    private void invalidateCreatedTasks( String type )
  -    {
  -        synchronized( createdTasks )
  -        {
  -            Vector v = (Vector)createdTasks.get( type );
  -            if( v != null )
  -            {
  -                Enumeration enum = v.elements();
  -                while( enum.hasMoreElements() )
  -                {
  -                    Task t = (Task)enum.nextElement();
  -                    t.markInvalid();
  -                }
  -                v.removeAllElements();
  -                createdTasks.remove( type );
  -            }
           }
       }
   }
  
  
  
  1.4       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProjectHelper.java	2001/12/16 01:01:19	1.3
  +++ ProjectHelper.java	2001/12/16 03:10:44	1.4
  @@ -1018,7 +1018,6 @@
                   task.setTaskName( tag );
               }
   
  -            task.setLocation( new Location( buildFile.toString(), locator.getLineNumber(),
locator.getColumnNumber() ) );
               configureId( task, attrs );
   
               // Top level tasks don't have associated targets
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnknownElement.java	2001/12/15 14:55:54	1.2
  +++ UnknownElement.java	2001/12/16 03:10:44	1.3
  @@ -250,7 +250,6 @@
   
           if( task != null )
           {
  -            task.setLocation( getLocation() );
               // UnknownElement always has an associated target
               task.setOwningTarget( target );
               task.init();
  
  
  
  1.4       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Get.java	2001/12/16 00:38:01	1.3
  +++ Get.java	2001/12/16 03:10:44	1.4
  @@ -305,7 +305,6 @@
               Touch touch = (Touch)project.createTask( "touch" );
               touch.setOwningTarget( target );
               touch.setTaskName( getTaskName() );
  -            touch.setLocation( getLocation() );
               touch.setFile( file );
               touch.setMillis( timemillis );
               touch.touch();
  
  
  
  1.5       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Tstamp.java	2001/12/16 02:05:41	1.4
  +++ Tstamp.java	2001/12/16 03:10:44	1.5
  @@ -74,7 +74,7 @@
               while( i.hasMoreElements() )
               {
                   CustomFormat cts = (CustomFormat)i.nextElement();
  -                cts.execute( project, d, location );
  +                cts.execute( project, d );
               }
   
           }
  @@ -207,7 +207,7 @@
               field = unit.getCalendarField();
           }
   
  -        public void execute( Project project, Date date, Location location )
  +        public void execute( Project project, Date date )
               throws TaskException
           {
               if( propertyName == null )
  
  
  
  1.6       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultCompilerAdapter.java	2001/12/16 02:05:42	1.5
  +++ DefaultCompilerAdapter.java	2001/12/16 03:10:44	1.6
  @@ -51,7 +51,6 @@
       protected Path extdirs;
       protected boolean includeAntRuntime;
       protected boolean includeJavaRuntime;
  -    protected Location location;
       protected String memoryInitialSize;
       protected String memoryMaximumSize;
       protected Project project;
  @@ -80,7 +79,6 @@
           compileList = attributes.getFileList();
           compileClasspath = attributes.getClasspath();
           project = attributes.getProject();
  -        location = attributes.getLocation();
           includeAntRuntime = attributes.getIncludeantruntime();
           includeJavaRuntime = attributes.getIncludejavaruntime();
           memoryInitialSize = attributes.getMemoryInitialSize();
  
  
  
  1.5       +0 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  
  Index: GenericDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GenericDeploymentTool.java	2001/12/16 00:37:02	1.4
  +++ GenericDeploymentTool.java	2001/12/16 03:10:44	1.5
  @@ -460,11 +460,6 @@
           return baseName;
       }
   
  -    protected Location getLocation()
  -    {
  -        return getTask().getLocation();
  -    }
  -
       /**
        * Returns the Public ID of the DTD specified in the EJB descriptor. Not
        * every vendor-specific <code>DeploymentTool</code> will need to reference
  
  
  

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