avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools MerlinBean.java
Date Thu, 08 May 2003 05:25:13 GMT
mcconnell    2003/05/07 22:25:13

  Modified:    merlin/merlin-plugin plugin.jelly
               merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools
                        MerlinBean.java
  Log:
  Added better handling of debug level with respect to Merlin Jelly.
  
  Revision  Changes    Path
  1.4       +2 -2      avalon-sandbox/merlin/merlin-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly	8 May 2003 03:55:57 -0000	1.3
  +++ plugin.jelly	8 May 2003 05:25:13 -0000	1.4
  @@ -85,7 +85,7 @@
   
       <j:set var="merlin.debug" value="${merlin.kernel.debug}"/>
       <j:if test="${merlin.debug == null}">
  -      <j:set var="merlin.debug" value="DEBUG"/>
  +      <j:set var="merlin.debug" value="INFO"/>
       </j:if>
   
       <j:set var="wait" value="${merlin.kernel.wait}"/>
  @@ -150,7 +150,7 @@
   
       <j:set var="merlin.debug" value="${merlin.kernel.debug}"/>
       <j:if test="${merlin.debug == null}">
  -      <j:set var="merlin.debug" value="DEBUG"/>
  +      <j:set var="merlin.debug" value="INFO"/>
       </j:if>
   
       <j:set var="wait" value="${merlin.kernel.wait}"/>
  
  
  
  1.3       +38 -34    avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
  
  Index: MerlinBean.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MerlinBean.java	8 May 2003 03:55:57 -0000	1.2
  +++ MerlinBean.java	8 May 2003 05:25:13 -0000	1.3
  @@ -209,45 +209,49 @@
   
       public void doExecute() throws Exception
       {
  -        final String system =
  -          "System '" + m_system + "'";
  -        System.out.println( system );
  -
  -        final String kernelConfig =
  -          "Kernel '" + m_kernelPath + "'";
  -        System.out.println( kernelConfig );
  -
  -        final String conf =
  -          "Config '" + m_conf + "' (" + m_conf.exists() + ")";
  -        System.out.println( conf );
  -
  -        if( m_target != null )
  +        if( m_debug.equalsIgnoreCase( "debug" ) )
           {
  -            if( m_path != null )
  +            final String system =
  +              "System '" + m_system + "'";
  +            System.out.println( system );
  +
  +            final String kernelConfig =
  +              "Kernel '" + m_kernelPath + "'";
  +            System.out.println( kernelConfig );
  +   
  +            final String conf =
  +              "Config '" + m_conf + "' (" + m_conf.exists() + ")";
  +            System.out.println( conf );
  +
  +            if( m_target != null )
  +            {
  +                if( m_path != null )
  +                {
  +                    final String error = 
  +                      "Incompatible arguments - use target or path.";
  +                    throw new IllegalArgumentException( error );
  +                }
  +
  +                final String target =
  +                  "Target '" + m_target + "'";
  +                System.out.println( target );
  +            } 
  +            else
               {
  -                final String error = 
  -                  "Incompatible arguments - use target or path.";
  -                throw new IllegalArgumentException( error );
  +                final String path =
  +                  "Path '" + m_path + "'";
  +                System.out.println( path );
  +
  +                final String base =
  +                  "Base '" + m_base + "'";
  +                System.out.println( base );
               }
   
  -            final String target =
  -              "Target '" + m_target + "'";
  -            System.out.println( target );
  +            final String debug =
  +              "Debug '" + m_debug + "'";
  +            System.out.println( debug );
  +            System.out.println( "" );
           }
  -        else
  -        {
  -            final String path =
  -              "Path '" + m_path + "'";
  -            System.out.println( path );
  -
  -            final String base =
  -              "Base '" + m_base + "'";
  -            System.out.println( base );
  -        }
  -
  -        final String debug =
  -          "Debug '" + m_debug + "'";
  -        System.out.println( debug );
   
           try
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message