ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@locus.apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java MSVSSGET.java
Date Tue, 28 Nov 2000 14:15:32 GMT
bodewig     00/11/28 06:15:30

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSGET.java
  Log:
  New attribute "autoresponse" for <vssget>.
  
  Submitted by:	Alan Zall <alan@inskey.com>
  
  Revision  Changes    Path
  1.53      +5 -1      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- WHATSNEW	2000/11/25 01:46:00	1.52
  +++ WHATSNEW	2000/11/28 14:15:08	1.53
  @@ -28,7 +28,7 @@
   * <cab> can work on non-Windows platforms with the help of libcabinet. 
     See http://trill.cis.fordham.edu/~barbacha/cabinet_library/.
   
  -* <FTP> now supports passive mode.
  +* <ftp> now supports passive mode.
   
   Fixed bugs:
   -----------
  @@ -46,6 +46,10 @@
     CMP files are included by parsing the weblogic deployment descriptor rather than
     relying on the naming convention used in ant 1.2
     Include super classes and super interfaces into the generated ejb jar files
  +
  +* <vssget> now correctly deals with spaces in arguments
  +
  +* <jar> fails early if a given manifest file doesn't exist
   
   Changes from Ant 1.1 to Ant 1.2
   ===============================
  
  
  
  1.6       +5 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  
  Index: MSVSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MSVSS.java	2000/11/25 02:38:53	1.5
  +++ MSVSS.java	2000/11/28 14:15:20	1.6
  @@ -192,7 +192,11 @@
       /** */
       public static final String FLAG_OVERRIDE_WORKING_DIR = "-GL";
       /** */
  -    public static final String FLAG_AUTORESPONSE = "-I";
  +    public static final String FLAG_AUTORESPONSE_DEF = "-I-";
  +    /** */
  +    public static final String FLAG_AUTORESPONSE_YES = "-I-Y";
  +    /** */
  +    public static final String FLAG_AUTORESPONSE_NO = "-I-N";
       /** */
       public static final String FLAG_RECURSION = "-R";
       /** */
  
  
  
  1.5       +32 -2     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
  
  Index: MSVSSGET.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSGET.java	2000/11/28 13:43:24	1.4
  +++ MSVSSGET.java	2000/11/28 14:15:21	1.5
  @@ -124,6 +124,7 @@
       private String m_Version = null;
       private String m_Date = null;
       private String m_Label = null;
  +    private String m_AutoResponse = null;
   
       /**
        * Executes the task.
  @@ -153,8 +154,8 @@
           commandLine.createArgument().setValue(getVsspath());
           // -GL
           getLocalpathCommand(commandLine);
  -        // -I-
  -        commandLine.createArgument().setValue("-I-");  // ignore all errors
  +        // -I- or -I-Y or -I-N
  +        getAutoresponse(commandLine);
           // -R
           getRecursiveCommand(commandLine);
           // -V
  @@ -304,6 +305,35 @@
               cmd.createArgument().setValue(FLAG_VERSION_LABEL);
               cmd.createArgument().setValue(m_Label);
           }
  +    }
  +
  +    public void setAutoresponse(String response){
  +        if ( response.equals("") || response.equals("null") ) {
  +            m_AutoResponse = null;
  +        } else {
  +            m_AutoResponse = response;
  +        }
  +    }
  +    
  +    /**
  +     * Checks the value set for the autoResponse.
  +     * if it equals "Y" then we return -I-Y
  +     * if it equals "N" then we return -I-N
  +     * otherwise we return -I
  +     */
  +    public void getAutoresponse(Commandline cmd) {
  +        
  +        if ( m_AutoResponse == null) {
  +            cmd.createArgument().setValue(FLAG_AUTORESPONSE_DEF);
  +        } else if ( m_AutoResponse.equalsIgnoreCase("Y")) {
  +            cmd.createArgument().setValue(FLAG_AUTORESPONSE_YES);
  +            
  +        } else if ( m_AutoResponse.equalsIgnoreCase("N")) {
  +            cmd.createArgument().setValue(FLAG_AUTORESPONSE_NO);
  +        }else {
  +            cmd.createArgument().setValue(FLAG_AUTORESPONSE_DEF);
  +        } // end of else
  +
       }
   
   }
  
  
  

Mime
View raw message