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 project.xml
Date Sun, 07 Sep 2003 13:34:55 GMT
mcconnell    2003/09/07 06:34:55

  Modified:    merlin   maven.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        JRMPKernelAdaptor.java
               merlin/merlin-plugin project.xml
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.52      +1 -1      avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- maven.xml	5 Sep 2003 10:00:32 -0000	1.51
  +++ maven.xml	7 Sep 2003 13:34:54 -0000	1.52
  @@ -17,7 +17,7 @@
     <ant:property name="merlin.home" value="${env.MERLIN_HOME}"/>
   
     <goal name="merlin:update">
  -    <attainGoal name="merlin:clean"/>
  +    <!--<attainGoal name="merlin:clean"/>-->
       <attainGoal name="merlin:install"/>
       <attainGoal name="merlin:site"/>
       <attainGoal name="merlin:tutorials"/>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/JRMPKernelAdaptor.java
  
  Index: JRMPKernelAdaptor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/JRMPKernelAdaptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JRMPKernelAdaptor.java	7 Sep 2003 11:34:14 -0000	1.2
  +++ JRMPKernelAdaptor.java	7 Sep 2003 13:34:54 -0000	1.3
  @@ -87,7 +87,7 @@
   
      /**
       * Creation of a new adapter.
  -    * @param logging the assigned logging channel
  +    * @param logger the assigned logging channel
       * @param server the mbean server
       */
       public JRMPKernelAdaptor( Logger logger, MBeanServer server ) 
  @@ -98,7 +98,7 @@
   
      /**
       * Creation of a new adapter.
  -    * @param logging the assigned logging channel
  +    * @param logger the assigned logging channel
       * @param server the mbean server
       * @param port the port on which the adapter is conected
       */
  
  
  
  1.20      +13 -0     avalon-sandbox/merlin/merlin-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- project.xml	1 Sep 2003 02:18:13 -0000	1.19
  +++ project.xml	7 Sep 2003 13:34:54 -0000	1.20
  @@ -12,6 +12,19 @@
   
     <dependencies>
   
  +    <!-- mx4j dependecies -->
  +
  +    <dependency>
  +      <groupId>mx4j</groupId>
  +      <artifactId>mx4j-jmx</artifactId>
  +      <version>1.1.1</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>mx4j</groupId>
  +      <artifactId>mx4j-tools</artifactId>
  +      <version>1.1.1</version>
  +    </dependency>
  +
       <!-- merlin -->
   
       <dependency>
  
  
  

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


Mime
View raw message