You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/02 01:38:46 UTC

cvs commit: avalon/util/plugin plugin.jelly

mcconnell    2004/02/01 16:38:46

  Modified:    util     maven.xml
               util/criteria/src/java/org/apache/avalon/util/criteria
                        Parameter.java
               util/plugin plugin.jelly
  Log:
  Update Parameter to be Serializable and add support in the plugin for factory service export declaration.
  
  Revision  Changes    Path
  1.7       +0 -1      avalon/util/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/maven.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- maven.xml	31 Jan 2004 12:25:00 -0000	1.6
  +++ maven.xml	2 Feb 2004 00:38:45 -0000	1.7
  @@ -124,7 +124,6 @@
       </j:choose>
     </goal>
   
  -
     <goal
       name="xdist:build-bin" 
       prereqs="xdist:build-setup,xdist:prepare-bin-filesystem"
  
  
  
  1.3       +3 -2      avalon/util/criteria/src/java/org/apache/avalon/util/criteria/Parameter.java
  
  Index: Parameter.java
  ===================================================================
  RCS file: /home/cvs/avalon/util/criteria/src/java/org/apache/avalon/util/criteria/Parameter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Parameter.java	24 Jan 2004 23:18:55 -0000	1.2
  +++ Parameter.java	2 Feb 2004 00:38:46 -0000	1.3
  @@ -18,6 +18,7 @@
   package org.apache.avalon.util.criteria;
   
   import java.lang.reflect.Constructor;
  +import java.io.Serializable;
   
   /**
    * A parameter is an immutable class that contains a description 
  @@ -26,7 +27,7 @@
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$
    */
  -public class Parameter
  +public class Parameter implements Serializable
   {
       //--------------------------------------------------------------
       // static
  
  
  
  1.2       +14 -2     avalon/util/plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon/util/plugin/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly	8 Dec 2003 09:31:55 -0000	1.1
  +++ plugin.jelly	2 Feb 2004 00:38:46 -0000	1.2
  @@ -36,7 +36,6 @@
   #
   # Artifact descriptor.
   # 
  -
   avalon.artifact.group = ${pom.groupId}
   avalon.artifact.name = ${pom.artifactId}
   avalon.artifact.version = ${pom.currentVersion}
  @@ -49,6 +48,7 @@
             <j:if test="${dep.getType()=='jar'}">
               <j:if test="${index==0}">
                 <ant:echo file="${filename}" append="true">
  +
   #
   # API dependencies.
   #
  @@ -105,14 +105,26 @@
           <ant:echo file="${filename}" append="true">
   
   #
  -# Factory.
  +# Factory classname.
   #
   
   avalon.artifact.factory = ${context.getVariable('avalon.artifact.factory')}
   </ant:echo>
         </j:if>
   
  +      <j:if test="${context.getVariable('avalon.artifact.export') != null}">
  +        <ant:echo file="${filename}" append="true">
  +
  +#
  +# Service export.
  +#
  +
  +avalon.artifact.export = ${context.getVariable('avalon.artifact.export')}
  +</ant:echo>
  +      </j:if>
  +
         <ant:echo file="${filename}" append="true">
  +
   #
   # EOF
   #
  
  
  

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