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-cli/src/java Merlin.java
Date Sun, 20 Apr 2003 12:15:13 GMT
mcconnell    2003/04/20 05:15:13

  Modified:    merlin/merlin-cli maven.xml
               merlin/merlin-cli/src/java Merlin.java
  Log:
  Formatting and build procedure updates to handle manifest changes in Maven beta-9
  
  Revision  Changes    Path
  1.3       +2 -0      avalon-sandbox/merlin/merlin-cli/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	17 Apr 2003 05:55:45 -0000	1.2
  +++ maven.xml	20 Apr 2003 12:15:13 -0000	1.3
  @@ -1,5 +1,7 @@
   <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
   
  +  <property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>
  +
     <!--
     Get the i18n and Commons CLI jars and unpack them into the Maven 
     build directory.  This ensures that the resulting jar file is 
  
  
  
  1.7       +2 -1      avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
  
  Index: Merlin.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Merlin.java	16 Apr 2003 14:32:39 -0000	1.6
  +++ Merlin.java	20 Apr 2003 12:15:13 -0000	1.7
  @@ -402,7 +402,8 @@
   
           try
           {
  -            Method method = kernelLoader.getClass().getMethod( "build", new Class[]{ Map.class
} );
  +            Method method = 
  +              kernelLoader.getClass().getMethod( "build", new Class[]{ Map.class } );
               method.invoke( kernelLoader, new Object[]{ map } );
           }
           catch( Throwable e )
  
  
  

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


Mime
View raw message