commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roxspr...@apache.org
Subject cvs commit: jakarta-commons/cli/src/test/org/apache/commons/cli2/jdepend JDependTest.java
Date Mon, 02 Feb 2004 01:29:55 GMT
roxspring    2004/02/01 17:29:55

  Modified:    cli/src/test/org/apache/commons/cli2/bugs Tag:
                        RESEARCH_CLI_2_ROXSPRING Bug13935Test.java
                        Bug13886Test.java Bug15046Test.java
                        Bug15648Test.java
               cli/src/test/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING HelpFormatterTest.java
                        CommandLineTest.java PrecedenceTest.java
                        CommandLineDefaultsTest.java DocumentationTest.java
               cli/src/java/org/apache/commons/cli2/resources Tag:
                        RESEARCH_CLI_2_ROXSPRING ResourceHelper.java
               cli/src/test/org/apache/commons/cli2/apps Tag:
                        RESEARCH_CLI_2_ROXSPRING CvsTest.java LsTest.java
                        CpTest.java AntTest.java
               cli/src/test/org/apache/commons/cli2/jdepend Tag:
                        RESEARCH_CLI_2_ROXSPRING JDependTest.java
  Added:       cli/src/java/org/apache/commons/cli2/impl Tag:
                        RESEARCH_CLI_2_ROXSPRING Comparators.java
                        MissingOptionException.java Command.java
                        BadPropertyException.java
                        MissingValueException.java DefaultOption.java
                        ParentImpl.java messages.properties
                        SourceDestArgument.java
                        UnexpectedOptionException.java OptionImpl.java
                        ArgumentImpl.java BurstException.java
                        PropertyOption.java Switch.java
                        UnexpectedValueException.java GroupImpl.java
               cli/src/java/org/apache/commons/cli2/commandline Tag:
                        RESEARCH_CLI_2_ROXSPRING CommandLineImpl.java
                        Parser.java
               cli/src/test/org/apache/commons/cli2/impl Tag:
                        RESEARCH_CLI_2_ROXSPRING GroupTestCase.java
                        PropertyOptionTest.java GroupTest.java
                        OptionTestCase.java ParentTest.java
                        CommandTest.java ComparatorsTest.java
                        ArgumentTestCase.java ParentTestCase.java
                        ArgumentTest.java SwitchTest.java
                        DefaultOptionTest.java
               cli/src/java/org/apache/commons/cli2/builders Tag:
                        RESEARCH_CLI_2_ROXSPRING DefaultOptionBuilder.java
                        PatternBuilder.java CommandBuilder.java
                        SwitchBuilder.java ArgumentBuilder.java
                        GroupBuilder.java
  Removed:     cli/src/java/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING BurstException.java
                        CommandLineImpl.java MissingValueException.java
                        ParentImpl.java Comparators.java
                        DefaultOptionBuilder.java Switch.java Command.java
                        BadPropertyException.java DefaultOption.java
                        MissingOptionException.java messages.properties
                        UnexpectedOptionException.java
                        UnexpectedValueException.java GroupBuilder.java
                        SwitchBuilder.java PropertyOption.java
                        OptionImpl.java CommandBuilder.java
                        PatternBuilder.java ArgumentImpl.java
                        SourceDestArgument.java GroupImpl.java
                        ArgumentBuilder.java CommandLineParser.java
               cli/src/test/org/apache/commons/cli2 Tag:
                        RESEARCH_CLI_2_ROXSPRING ArgumentTest.java
                        ArgumentTestCase.java GroupTestCase.java
                        ParentTestCase.java SwitchTest.java
                        ComparatorsTest.java ParentTest.java GroupTest.java
                        OptionTestCase.java PropertyOptionTest.java
                        CommandTest.java DefaultOptionTest.java
  Log:
  Repackaged cli2 classes using new impl, builders, commandline subpackaged.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +407 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Comparators.java
  
  
  
  
  1.1.2.1   +86 -0     jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/MissingOptionException.java
  
  
  
  
  1.1.2.1   +229 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Command.java
  
  
  
  
  1.1.2.1   +87 -0     jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/BadPropertyException.java
  
  
  
  
  1.1.2.1   +86 -0     jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/MissingValueException.java
  
  
  
  
  1.1.2.1   +275 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/DefaultOption.java
  
  
  
  
  1.1.2.1   +230 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ParentImpl.java
  
  
  
  
  1.1.2.1   +9 -0      jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/messages.properties
  
  
  
  
  1.1.2.1   +190 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/SourceDestArgument.java
  
  
  
  
  1.1.2.1   +115 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/UnexpectedOptionException.java
  
  
  
  
  1.1.2.1   +138 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/OptionImpl.java
  
  
  
  
  1.1.2.1   +493 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/ArgumentImpl.java
  
  
  
  
  1.1.2.1   +89 -0     jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/BurstException.java
  
  
  
  
  1.1.2.1   +220 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/PropertyOption.java
  
  
  
  
  1.1.2.1   +268 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/Switch.java
  
  
  
  
  1.1.2.1   +92 -0     jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/UnexpectedValueException.java
  
  
  
  
  1.1.2.1   +447 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/impl/Attic/GroupImpl.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +5 -5      jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug13935Test.java
  
  Index: Bug13935Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug13935Test.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Bug13935Test.java	22 Jan 2004 22:40:52 -0000	1.1.2.2
  +++ Bug13935Test.java	2 Feb 2004 01:29:53 -0000	1.1.2.3
  @@ -58,13 +58,13 @@
   
   import junit.framework.TestCase;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.Option;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
   
   /**
    * @author John Keyes
  @@ -94,7 +94,7 @@
                   .withOption(testOption)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(options);
           
           final CommandLine cmdLine = parser.parse(
  
  
  
  1.1.2.3   +6 -6      jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug13886Test.java
  
  Index: Bug13886Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug13886Test.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Bug13886Test.java	22 Jan 2004 22:40:52 -0000	1.1.2.2
  +++ Bug13886Test.java	2 Feb 2004 01:29:53 -0000	1.1.2.3
  @@ -59,13 +59,13 @@
   import junit.framework.TestCase;
   
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
  -import org.apache.commons.cli2.MissingOptionException;
   import org.apache.commons.cli2.Option;
  -import org.apache.commons.cli2.UnexpectedOptionException;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
  +import org.apache.commons.cli2.impl.MissingOptionException;
  +import org.apache.commons.cli2.impl.UnexpectedOptionException;
   
   /**
    * @author John Keyes
  @@ -98,7 +98,7 @@
                   .withMinimum(1)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(options);
           
           try {
  
  
  
  1.1.2.3   +5 -5      jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug15046Test.java
  
  Index: Bug15046Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug15046Test.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Bug15046Test.java	22 Jan 2004 22:40:52 -0000	1.1.2.2
  +++ Bug15046Test.java	2 Feb 2004 01:29:53 -0000	1.1.2.3
  @@ -58,13 +58,13 @@
   
   import junit.framework.TestCase;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.Option;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
   
   /**
    * @author John Keyes
  @@ -93,7 +93,7 @@
           Group options =
               gbuilder.withName("bug15046").withOption(option).create();
   
  -        CommandLineParser parser = new CommandLineParser();
  +        Parser parser = new Parser();
           parser.setGroup(options);
           CommandLine line = parser.parse(CLI_ARGS);
   
  
  
  
  1.1.2.3   +5 -5      jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug15648Test.java
  
  Index: Bug15648Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/bugs/Attic/Bug15648Test.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Bug15648Test.java	22 Jan 2004 22:40:52 -0000	1.1.2.2
  +++ Bug15648Test.java	2 Feb 2004 01:29:53 -0000	1.1.2.3
  @@ -58,13 +58,13 @@
   
   import junit.framework.TestCase;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.Option;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
   
   /**
    * @author John Keyes
  @@ -94,7 +94,7 @@
                   .withOption(testOption)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(options);
           
           final CommandLine cmdLine = parser.parse(
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +3 -0      jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/HelpFormatterTest.java
  
  Index: HelpFormatterTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/HelpFormatterTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- HelpFormatterTest.java	22 Jan 2004 22:40:50 -0000	1.1.2.2
  +++ HelpFormatterTest.java	2 Feb 2004 01:29:53 -0000	1.1.2.3
  @@ -63,6 +63,9 @@
   import java.io.StringWriter;
   import java.util.Iterator;
   
  +import org.apache.commons.cli2.builders.*;
  +import org.apache.commons.cli2.impl.*;
  +
   import junit.framework.TestCase;
   
   /**
  
  
  
  1.1.2.4   +7 -3      jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/CommandLineTest.java
  
  Index: CommandLineTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/CommandLineTest.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- CommandLineTest.java	31 Jan 2004 16:17:09 -0000	1.1.2.3
  +++ CommandLineTest.java	2 Feb 2004 01:29:53 -0000	1.1.2.4
  @@ -59,6 +59,10 @@
   import java.util.Iterator;
   import java.util.List;
   
  +import org.apache.commons.cli2.builders.*;
  +import org.apache.commons.cli2.commandline.Parser;
  +import org.apache.commons.cli2.impl.*;
  +
   import junit.framework.TestCase;
   
   /**
  @@ -242,7 +246,7 @@
                   .withOption(targets)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(group);
           final CommandLine cl = parser.parse(new String[]{"login","rob","--help","target1","target2"});
           
  @@ -269,7 +273,7 @@
                   .withOption(display)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(group);
           final CommandLine cl = parser.parse(new String[]{"--help","login","rob","--help","--help","target1","target2"});
           
  @@ -293,7 +297,7 @@
                   .withOption(display)
                   .create();
           
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(group);
           final CommandLine cl = parser.parse(new String[]{"--help","login","rob","--help","--help","target1","target2"});
           
  
  
  
  1.1.2.3   +6 -1      jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/PrecedenceTest.java
  
  Index: PrecedenceTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/PrecedenceTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- PrecedenceTest.java	22 Jan 2004 22:40:50 -0000	1.1.2.2
  +++ PrecedenceTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.3
  @@ -60,6 +60,11 @@
   import java.util.List;
   import java.util.Set;
   
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
  +
   import junit.framework.TestCase;
   
   /**
  @@ -451,7 +456,7 @@
       public CommandLine buildCommandLine(final Group group, final String[] args)
           throws OptionException
       {
  -        CommandLineParser p = new CommandLineParser();
  +        Parser p = new Parser();
           p.setGroup(group);
           return p.parse(args);
       }
  
  
  
  1.1.2.4   +4 -0      jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/CommandLineDefaultsTest.java
  
  Index: CommandLineDefaultsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/CommandLineDefaultsTest.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- CommandLineDefaultsTest.java	31 Jan 2004 16:17:10 -0000	1.1.2.3
  +++ CommandLineDefaultsTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.4
  @@ -58,6 +58,10 @@
   
   import java.util.ArrayList;
   
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.SwitchBuilder;
  +import org.apache.commons.cli2.commandline.CommandLineImpl;
  +
   import junit.framework.TestCase;
   
   /**
  
  
  
  1.1.2.3   +8 -1      jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/DocumentationTest.java
  
  Index: DocumentationTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/Attic/DocumentationTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- DocumentationTest.java	22 Jan 2004 22:40:50 -0000	1.1.2.2
  +++ DocumentationTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.3
  @@ -60,6 +60,13 @@
   import java.io.PrintWriter;
   import java.io.StringWriter;
   
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
  +import org.apache.commons.cli2.impl.PropertyOption;
  +import org.apache.commons.cli2.impl.UnexpectedOptionException;
  +
   import junit.framework.TestCase;
   
   /**
  @@ -162,7 +169,7 @@
   
   		final String[] args = new String[] { "--bad-option" };
   
  -		CommandLineParser parser = new CommandLineParser();
  +		Parser parser = new Parser();
           parser.setHelpFormatter(helpFormatter);
   		parser.setGroup(options);
   		parser.setHelpOption(help);
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +386 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/commandline/Attic/CommandLineImpl.java
  
  
  
  
  1.1.2.1   +185 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/commandline/Attic/Parser.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +73 -0     jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/GroupTestCase.java
  
  
  
  
  1.1.2.1   +253 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/PropertyOptionTest.java
  
  
  
  
  1.1.2.1   +448 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/GroupTest.java
  
  
  
  
  1.1.2.1   +179 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/OptionTestCase.java
  
  
  
  
  1.1.2.1   +462 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ParentTest.java
  
  
  
  
  1.1.2.1   +265 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/CommandTest.java
  
  
  
  
  1.1.2.1   +227 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ComparatorsTest.java
  
  
  
  
  1.1.2.1   +70 -0     jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ArgumentTestCase.java
  
  
  
  
  1.1.2.1   +66 -0     jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ParentTestCase.java
  
  
  
  
  1.1.2.1   +594 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/ArgumentTest.java
  
  
  
  
  1.1.2.1   +262 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/SwitchTest.java
  
  
  
  
  1.1.2.1   +250 -0    jakarta-commons/cli/src/test/org/apache/commons/cli2/impl/Attic/DefaultOptionTest.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +200 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/DefaultOptionBuilder.java
  
  
  
  
  1.1.2.1   +221 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/PatternBuilder.java
  
  
  
  
  1.1.2.1   +199 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/CommandBuilder.java
  
  
  
  
  1.1.2.1   +171 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/SwitchBuilder.java
  
  
  
  
  1.1.2.1   +301 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/ArgumentBuilder.java
  
  
  
  
  1.1.2.1   +119 -0    jakarta-commons/cli/src/java/org/apache/commons/cli2/builders/Attic/GroupBuilder.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.4   +8 -1      jakarta-commons/cli/src/java/org/apache/commons/cli2/resources/Attic/ResourceHelper.java
  
  Index: ResourceHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/java/org/apache/commons/cli2/resources/Attic/ResourceHelper.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- ResourceHelper.java	23 Jan 2004 00:17:34 -0000	1.1.2.3
  +++ ResourceHelper.java	2 Feb 2004 01:29:54 -0000	1.1.2.4
  @@ -59,6 +59,7 @@
   import java.text.MessageFormat;
   import java.util.HashMap;
   import java.util.Map;
  +import java.util.MissingResourceException;
   import java.util.ResourceBundle;
   
   /**
  @@ -103,7 +104,13 @@
               packageName + "messages";
               
           // initialize the bundle
  -        bundle = ResourceBundle.getBundle(bundleName);
  +        try{
  +            bundle = ResourceBundle.getBundle(bundleName);
  +        }
  +        catch(MissingResourceException e){
  +            //TODO Handle missing resources nicely
  +            bundle = null;
  +        }
           
           // cache bundle
           cache.put(bundleName, bundle);
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +5 -5      jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/CvsTest.java
  
  Index: CvsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/CvsTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- CvsTest.java	1 Feb 2004 23:31:43 -0000	1.1.2.1
  +++ CvsTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.2
  @@ -58,12 +58,12 @@
   
   import junit.framework.TestCase;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
  -import org.apache.commons.cli2.ArgumentTest;
  -import org.apache.commons.cli2.CommandBuilder;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.CommandBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.impl.ArgumentTest;
   
   //TODO Build up CvsTest like CpTest  
   public class CvsTest extends TestCase {
  
  
  
  1.1.2.3   +5 -5      jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/LsTest.java
  
  Index: LsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/LsTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- LsTest.java	22 Jan 2004 22:40:53 -0000	1.1.2.2
  +++ LsTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.3
  @@ -63,14 +63,14 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
   import org.apache.commons.cli2.validation.EnumValidator;
   
   /**
  @@ -335,7 +335,7 @@
   	 */
   	public void testLs() throws OptionException {
   		// create the command line parser
  -		CommandLineParser parser = new CommandLineParser();
  +		Parser parser = new Parser();
   		parser.setGroup(options);
   		CommandLine line = parser.parse(new String[] { "--block-size=10", "--color=never" });
   
  
  
  
  1.1.2.3   +10 -10    jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/CpTest.java
  
  Index: CpTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/CpTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- CpTest.java	22 Jan 2004 22:40:53 -0000	1.1.2.2
  +++ CpTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.3
  @@ -67,18 +67,18 @@
   import junit.framework.TestSuite;
   
   import org.apache.commons.cli2.Argument;
  -import org.apache.commons.cli2.ArgumentBuilder;
  -import org.apache.commons.cli2.ArgumentImpl;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.HelpFormatter;
  -import org.apache.commons.cli2.MissingValueException;
   import org.apache.commons.cli2.Option;
   import org.apache.commons.cli2.OptionException;
  -import org.apache.commons.cli2.SourceDestArgument;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
  +import org.apache.commons.cli2.impl.ArgumentImpl;
  +import org.apache.commons.cli2.impl.MissingValueException;
  +import org.apache.commons.cli2.impl.SourceDestArgument;
   
   /**
    * <p>
  @@ -423,7 +423,7 @@
   
       public void testNoSource() throws OptionException
       {
  -        CommandLineParser parser = new CommandLineParser();
  +        Parser parser = new Parser();
           parser.setGroup(options);
           try
           {
  @@ -439,7 +439,7 @@
       public void testOneSource() throws OptionException, IOException
       {
           final String[] args = new String[] { "source1", "dest1" };
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(options);
           final CommandLine commandLine = parser.parse(args);
   
  @@ -453,7 +453,7 @@
       {
           final String[] args =
               new String[] { "source1", "source2", "source3", "dest1" };
  -        final CommandLineParser parser = new CommandLineParser();
  +        final Parser parser = new Parser();
           parser.setGroup(options);
           final CommandLine commandLine = parser.parse(args);
   
  
  
  
  1.1.2.2   +6 -6      jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/AntTest.java
  
  Index: AntTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/apps/Attic/AntTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- AntTest.java	1 Feb 2004 23:31:43 -0000	1.1.2.1
  +++ AntTest.java	2 Feb 2004 01:29:54 -0000	1.1.2.2
  @@ -59,14 +59,14 @@
   import java.util.ArrayList;
   import java.util.List;
   
  -import org.apache.commons.cli2.ArgumentBuilder;
   import org.apache.commons.cli2.CommandLine;
  -import org.apache.commons.cli2.CommandLineParser;
  -import org.apache.commons.cli2.DefaultOptionBuilder;
   import org.apache.commons.cli2.Group;
  -import org.apache.commons.cli2.GroupBuilder;
   import org.apache.commons.cli2.OptionException;
  -import org.apache.commons.cli2.PropertyOption;
  +import org.apache.commons.cli2.builders.ArgumentBuilder;
  +import org.apache.commons.cli2.builders.DefaultOptionBuilder;
  +import org.apache.commons.cli2.builders.GroupBuilder;
  +import org.apache.commons.cli2.commandline.Parser;
  +import org.apache.commons.cli2.impl.PropertyOption;
   
   import junit.framework.TestCase;
   
  @@ -206,7 +206,7 @@
               .withOption(abuilder.withName("target").create())
               .create();
   
  -        CommandLineParser parser = new CommandLineParser();
  +        Parser parser = new Parser();
           parser.setGroup(options);
           CommandLine line =
               parser.parse(
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +1 -1      jakarta-commons/cli/src/test/org/apache/commons/cli2/jdepend/Attic/JDependTest.java
  
  Index: JDependTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/jdepend/Attic/JDependTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- JDependTest.java	1 Feb 2004 23:04:49 -0000	1.1.2.1
  +++ JDependTest.java	2 Feb 2004 01:29:55 -0000	1.1.2.2
  @@ -52,7 +52,7 @@
           
           assertEquals("Api should depend on no packages",0,dependsUpon.size());
       }
  -
  +    
       private Collection cli2Packages(final Collection incoming) {
           return namedPackages(incoming,"org.apache.commons.cli2",true);
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message