cvs commit: cocoon-2.1/src/java/org/apache/cocoon Main.java

[upayavira]

upayavira    2003/10/10 07:11:50

  Modified:    src/java/org/apache/cocoon Main.java
  Log:
  Reordering cli options to solve bug 23725. Thanks to vincent.arbousset at 
keyword.fr
  
  Revision  Changes    Path
  1.22      +4 -4      cocoon-2.1/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Main.java 8 Oct 2003 23:22:00 -0000       1.21
  +++ Main.java 10 Oct 2003 14:11:50 -0000      1.22
  @@ -329,9 +329,6 @@
           if (line.hasOption(BROKEN_LINK_FILE_OPT)) {
               
listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT));
           }
  -        if (line.hasOption(URI_FILE_OPT)) {
  -            
cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)),
 destDir);
  -        }
           if (line.hasOption(FOLLOW_LINKS_OPT)) {
               
cocoon.setFollowLinks(yesno(line.getOptionValue(FOLLOW_LINKS_OPT)));
           }
  @@ -340,6 +337,9 @@
           }
           if (line.hasOption(LOAD_CLASS_OPT)){
               
cocoon.addLoadedClasses(Arrays.asList(line.getOptionValues(LOAD_CLASS_OPT)));
  +        }
  +        if (line.hasOption(URI_FILE_OPT)) {
  +            
cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)),
 destDir);
           }
   
           cocoon.addTargets(line.getArgList(), destDir);