avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags TypeTag.java
Date Sat, 04 Oct 2003 11:51:25 GMT
mcconnell    2003/10/04 04:51:25

  Modified:    meta     maven.xml project.xml
               meta/plugin project.xml
               meta/site/etc site.jsl
               meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
                        TypeTag.java
  Log:
  Update to support meta info generation under test classes.
  
  Revision  Changes    Path
  1.2       +3 -3      avalon/meta/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	24 Sep 2003 08:14:55 -0000	1.1
  +++ maven.xml	4 Oct 2003 11:51:25 -0000	1.2
  @@ -1,6 +1,6 @@
  -<project default="avalon:build"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
  +<project default="avalon:plugin"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
   
  -  <ant:property name="meta.plugin.version" value="1.1"/>
  +  <ant:property name="meta.plugin.version" value="1.2-SNAPSHOT"/>
   
     <ant:property name="maven.ui.banner.background" value="#fff"/>
     <ant:property name="maven.ui.banner.foreground" value="#000"/>
  @@ -44,7 +44,7 @@
     avalon:build
     avalon:build-snapshot
     avalon:dist
  -  avalon:plugin
  +  avalon:plugin ---------- default goal
     avalon:site
       </echo>
   
  
  
  
  1.3       +1 -1      avalon/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	24 Sep 2003 08:42:56 -0000	1.2
  +++ project.xml	4 Oct 2003 11:51:25 -0000	1.3
  @@ -5,7 +5,7 @@
     <name>Avalon Meta</name>
     <groupId>avalon-meta</groupId>
     <id>avalon-meta</id>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.2-SNAPSHOT</currentVersion>
     <inceptionYear>2000</inceptionYear>
   
     <organization>
  
  
  
  1.2       +1 -1      avalon/meta/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	24 Sep 2003 08:15:52 -0000	1.1
  +++ project.xml	4 Oct 2003 11:51:25 -0000	1.2
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>avalon-meta-plugin</id>
     <name>Avalon Meta Plugin</name>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.2-SNAPSHOT</currentVersion>
     <description>Avalon Plugin for Maven</description>
     <shortDescription>Avalon Plugin for Maven</shortDescription>
     <package>org.apache.avalon</package>
  
  
  
  1.2       +60 -2     avalon/meta/site/etc/site.jsl
  
  Index: site.jsl
  ===================================================================
  RCS file: /home/cvs/avalon/meta/site/etc/site.jsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site.jsl	24 Sep 2003 08:15:55 -0000	1.1
  +++ site.jsl	4 Oct 2003 11:51:25 -0000	1.2
  @@ -1,5 +1,53 @@
   <?xml version="1.0"?>
  -<!-- stylesheet to be used -->
  +
  +<!--
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  +
  + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  +
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, are permitted provided that the following conditions are met:
  +
  + 1. Redistributions of  source code must  retain the above copyright  notice,
  +    this list of conditions and the following disclaimer.
  +
  + 2. Redistributions in binary form must reproduce the above copyright notice,
  +    this list of conditions and the following disclaimer in the documentation
  +    and/or other materials provided with the distribution.
  +
  + 3. The end-user documentation included with the redistribution, if any, must
  +    include  the following  acknowledgment:  "This product includes  software
  +    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  +    Alternately, this  acknowledgment may  appear in the software itself,  if
  +    and wherever such third-party acknowledgments normally appear.
  +
  + 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
  +    "Apache Software Foundation"  must not be used to endorse or promote
  +    products derived  from this  software without  prior written
  +    permission. For written permission, please contact apache@apache.org.
  +
  + 5. Products  derived from this software may not  be called "Apache", nor may
  +    "Apache" appear  in their name,  without prior written permission  of the
  +    Apache Software Foundation.
  +
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +
  + This software  consists of voluntary contributions made  by many individuals
  + on  behalf of the Apache Software  Foundation. For more  information on the
  + Apache Software Foundation, please see http://www.apache.org/.
  +-->
  +
   <jsl:stylesheet select="$doc"
     xmlns:define="jelly:define"
     xmlns:j="jelly:core"
  @@ -78,12 +126,21 @@
                   </j:if>
                 </td>
   
  +              <td>
  +                <div align="right" id="login">
  +                  <a href='http://apachecon.com/2003/US/index.html'>
  +                    <img border='0' src='http://www.apache.org/~ceki/ac2003/ac2003-150.gif'/>
  +                  </a>
  +                </div>
  +              </td>
  +
  +
                 <!-- project logo and link -->
  +              <!--
                 <td>
                   <div align="right" id="login">
                     <j:set var="logo" value="${pom.logo}"/>
                     <j:if test="${logo != null and logo != ''}">
  -                    <!-- set image to relative or complete -->
                       <j:set var="image" value="${pom.logo}"/>
                       <j:if test="${!image.startsWith('http://')}">
                         <j:set var="image" value="${relativePath}${image}"/>
  @@ -95,6 +152,7 @@
                     </j:if>
                   </div>
                 </td>
  +              -->
               </tr>
             </table>
           </div>
  
  
  
  1.2       +2 -2      avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java
  
  Index: TypeTag.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TypeTag.java	24 Sep 2003 08:16:18 -0000	1.1
  +++ TypeTag.java	4 Oct 2003 11:51:25 -0000	1.2
  @@ -165,6 +165,6 @@
   
       private Version getVersion(DocletTag tag)
       {
  -        return Version.getVersion( getNamedParameter( tag, VERSION_PARAM, "" ) );
  +        return Version.getVersion( getNamedParameter( tag, VERSION_PARAM, "1.0" ) );
       }
   }
  
  
  

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


Mime
View raw message