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 project.xml
Date Thu, 01 Jan 2004 21:48:37 GMT
mcconnell    2004/01/01 13:48:37

  Modified:    meta     project.xml
               meta/impl project.xml
               meta/impl/src/java/org/apache/avalon/meta/info/writer
                        XMLTypeWriter.java
               meta/plugin project.xml
               meta/tools project.xml
  Added:       meta     .cvsignore
  Log:
  Correct bug in the XML externalization of a type related to incorect generation of a context
entry when the optional parameter is present.  Bump impementation version from 1.3 to 1.3.1.
  
  Revision  Changes    Path
  1.10      +1 -1      avalon/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	26 Dec 2003 09:21:21 -0000	1.9
  +++ project.xml	1 Jan 2004 21:48:36 -0000	1.10
  @@ -5,7 +5,7 @@
     <name>Avalon Meta</name>
     <groupId>avalon-meta</groupId>
     <id>avalon-meta</id>
  -  <currentVersion>1.3</currentVersion>
  +  <currentVersion>1.3.1</currentVersion>
     <inceptionYear>2000</inceptionYear>
   
     <organization>
  
  
  
  1.1                  avalon/meta/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  target
  .classpath
  .project
  *.log
  
  
  1.6       +1 -1      avalon/meta/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	18 Dec 2003 01:10:32 -0000	1.5
  +++ project.xml	1 Jan 2004 21:48:37 -0000	1.6
  @@ -6,7 +6,7 @@
     <name>Avalon Meta Model Implementation</name>
     <package>org.apache.avalon.meta</package>
   
  -  <currentVersion>1.3</currentVersion>
  +  <currentVersion>1.3.1</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Meta Model Builder and Verification Framework</shortDescription>
     
  
  
  
  1.6       +10 -10    avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java
  
  Index: XMLTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLTypeWriter.java	11 Dec 2003 08:48:12 -0000	1.5
  +++ XMLTypeWriter.java	1 Jan 2004 21:48:37 -0000	1.6
  @@ -286,7 +286,8 @@
           throws IOException
       {
           writer.write( "\n    <entry key=\"" );
  -        writer.write( entry.getKey() + "\" " );
  +        writer.write( entry.getKey() );
  +        writer.write( "\" " );
   
           if( !entry.getClassname().equals( "java.lang.String" ) )
           {
  @@ -294,21 +295,20 @@
               writer.write( entry.getClassname() );
               writer.write( "\" " );
           }
  -
  -        if( entry.getAlias() != null )
  +        if(( entry.getAlias() != null ) && !entry.getAlias().equals( entry.getKey()
) )
           {
  -            if( !entry.getAlias().equals( entry.getKey() ) )
  -            {
  -                writer.write( "alias=\"" + entry.getAlias() + "\" " );
  -            }
  +            writer.write( "alias=\"" + entry.getAlias() );
  +            writer.write( "\" " );
           }
           if( entry.isOptional() )
           {
  -            writer.write( "\" optional=\"true\" " );
  +            writer.write( "optional=\"true\" " );
  +            writer.write( "\" " );
           }
           if( entry.isVolatile() )
           {
  -            writer.write( "\" volatile=\"true\" " );
  +            writer.write( "volatile=\"true\" " );
  +            writer.write( "\" " );
           }
   
           writer.write( "/>" );
  
  
  
  1.9       +2 -2      avalon/meta/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	18 Dec 2003 01:10:32 -0000	1.8
  +++ project.xml	1 Jan 2004 21:48:37 -0000	1.9
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>avalon-meta-plugin</id>
     <name>Avalon Meta Model Plugin</name>
  -  <currentVersion>1.3</currentVersion>
  +  <currentVersion>1.3.1</currentVersion>
     <description>Avalon Plugin for Maven</description>
     <shortDescription>Avalon Plugin for Maven</shortDescription>
     <package>org.apache.avalon</package>
  @@ -36,7 +36,7 @@
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.3</version>
  +      <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>avalon-meta</groupId>
  
  
  
  1.7       +1 -1      avalon/meta/tools/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/tools/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	18 Dec 2003 01:10:32 -0000	1.6
  +++ project.xml	1 Jan 2004 21:48:37 -0000	1.7
  @@ -49,7 +49,7 @@
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-impl</artifactId>
  -      <version>1.3</version>
  +      <version>1.3.1</version>
       </dependency>
   
       <dependency>
  
  
  

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


Mime
View raw message