You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/05/03 13:35:22 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic DefaultRmicAdapter.java WLRmic.java

bodewig     01/05/03 04:35:21

  Modified:    src/main/org/apache/tools/ant/taskdefs/rmic
                        DefaultRmicAdapter.java WLRmic.java
  Log:
  Pass -noexit flag to weblogic.rmic
  
  PR: 1333
  
  Revision  Changes    Path
  1.4       +17 -0     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  
  Index: DefaultRmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultRmicAdapter.java	2001/04/24 08:41:56	1.3
  +++ DefaultRmicAdapter.java	2001/05/03 11:35:20	1.4
  @@ -180,7 +180,24 @@
        * setup rmic argument for rmic.
        */
       protected Commandline setupRmicCommand() {
  +        return setupRmicCommand(null);
  +    }
  +
  +    /**
  +     * setup rmic argument for rmic.
  +     *
  +     * @param options additional parameters needed by a specific
  +     *                implementation.
  +     */
  +    protected Commandline setupRmicCommand(String[] options) {
           Commandline cmd = new Commandline();
  +
  +        if (options != null) {
  +            for (int i=0; i<options.length; i++) {
  +                cmd.createArgument().setValue(options[i]);
  +            }
  +        }
  +
           Path classpath = getCompileClasspath();
   
           cmd.createArgument().setValue("-d");
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
  
  Index: WLRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WLRmic.java	2001/03/19 11:22:52	1.1
  +++ WLRmic.java	2001/05/03 11:35:20	1.2
  @@ -73,7 +73,7 @@
   
       public boolean execute() throws BuildException {
           getRmic().log("Using WebLogic rmic", Project.MSG_VERBOSE);
  -        Commandline cmd = setupRmicCommand();
  +        Commandline cmd = setupRmicCommand(new String[] {"-noexit"});
   
           PrintStream err = System.err;
           PrintStream out = System.out;
  @@ -88,7 +88,7 @@
               Class c = Class.forName("weblogic.rmic");
               Method doRmic = c.getMethod("main", 
                                           new Class [] { String[].class });
  -            doRmic.invoke(null, new Object[] { cmd.getArguments() });
  +            doRmic.invoke(null, new Object[] {  });
               return true;
           } catch (ClassNotFoundException ex) {
               throw new BuildException("Cannot use WebLogic rmic, as it is not available"+