You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/05/20 21:46:32 UTC

cvs commit: avalon/tools announcement.xml idea.code.style.xml

bloritsch    2003/05/20 12:46:32

  Modified:    .        build.xml
               src/java/org/apache/avalon/framework Version.java
               src/test/org/apache/avalon/framework/test
                        VersionTestCase.java
               src/xdocs guide-cop-in-avalon.xml guide-cop-what-is.xml
                        guide-patterns-ioc-security.xml
                        guide-patterns-ioc.xml guide-patterns-what-are.xml
                        reference-containers.xml tabs.xml
               tools    announcement.xml idea.code.style.xml
  Log:
  fix CRLF
  
  Revision  Changes    Path
  1.180     +14 -2     avalon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/build.xml,v
  retrieving revision 1.179
  retrieving revision 1.180
  diff -u -r1.179 -r1.180
  --- build.xml	11 Apr 2003 18:58:39 -0000	1.179
  +++ build.xml	20 May 2003 19:46:30 -0000	1.180
  @@ -766,8 +766,20 @@
               <fileset dir="." includes="**/*~" defaultexcludes="no"/>
           </delete>
       </target>
  -    
  -    <!-- Cleans absolutely everything up -->
  +
  +  <!-- ===================================================================== -->
  +  <!-- Fix Whitespace problems in source code                                -->
  +  <!-- ===================================================================== -->
  +  <target name="fixCRLF">
  +  <fixcrlf srcdir="."
  +           includes="**/*.java,**/*.xml,*.xml,*.properties,**/*.properties"
  +           eol="lf"
  +           tab="remove"
  +           tablength="4"
  +           eof="remove"/>
  +  </target>    
  +
  +  <!-- Cleans absolutely everything up -->
       <target name="distclean" depends="clean" description="cleans up all generated files and directories">
           <delete dir="${docs.dir}"/>
           <delete dir="${dist.base}"/>
  
  
  
  1.28      +32 -32    avalon/src/java/org/apache/avalon/framework/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/avalon/src/java/org/apache/avalon/framework/Version.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Version.java	20 May 2003 19:41:55 -0000	1.27
  +++ Version.java	20 May 2003 19:46:31 -0000	1.28
  @@ -200,17 +200,17 @@
        */
       public boolean equals( final Version other )
       {
  -    	boolean isEqual = ( getMajor() == other.getMajor() );
  -    	
  -		if ( isEqual )
  -		{
  -			isEqual = ( getMinor() == other.getMinor() );
  -		}
  -    	
  -		if ( isEqual )
  -		{
  -			isEqual = ( getMicro() == other.getMicro() );
  -		}
  +        boolean isEqual = ( getMajor() == other.getMajor() );
  +        
  +        if ( isEqual )
  +        {
  +            isEqual = ( getMinor() == other.getMinor() );
  +        }
  +        
  +        if ( isEqual )
  +        {
  +            isEqual = ( getMicro() == other.getMicro() );
  +        }
   
           return isEqual;
       }
  @@ -225,8 +225,8 @@
        */
       public boolean equals( final Object other )
       {
  -    	boolean isEqual = false;
  -    	
  +        boolean isEqual = false;
  +        
           if( other instanceof Version )
           {
               isEqual = equals( (Version)other );
  @@ -245,13 +245,13 @@
        */
       public int hashCode()
       {
  -    	int hash = getMajor();
  -    	hash >>>= 17;
  -    	hash += getMinor();
  -    	hash >>>= 17;
  -    	hash += getMicro();
  -    	
  -    	return hash;
  +        int hash = getMajor();
  +        hash >>>= 17;
  +        hash += getMinor();
  +        hash >>>= 17;
  +        hash += getMicro();
  +        
  +        return hash;
       }
   
       /**
  @@ -323,19 +323,19 @@
        * 
        * @return number indicating relative value (-1, 0, 1)
        */
  -	public int compareTo(Object o) {
  -		Version other = (Version)o;
  -		int val = 0;
  +    public int compareTo(Object o) {
  +        Version other = (Version)o;
  +        int val = 0;
   
  -		if ( getMajor() < other.getMajor() ) val = -1;
  -		if ( 0 == val && getMajor() > other.getMajor() ) val = 1;
  +        if ( getMajor() < other.getMajor() ) val = -1;
  +        if ( 0 == val && getMajor() > other.getMajor() ) val = 1;
   
  -		if ( 0 == val && getMinor() < other.getMinor() ) val = -1;
  -		if ( 0 == val && getMinor() > other.getMinor() ) val = 1;
  +        if ( 0 == val && getMinor() < other.getMinor() ) val = -1;
  +        if ( 0 == val && getMinor() > other.getMinor() ) val = 1;
   
  -		if ( 0 == val && getMicro() < other.getMicro() ) val = -1;
  -		if ( 0 == val && getMicro() > other.getMicro() ) val = 1;
  +        if ( 0 == val && getMicro() < other.getMicro() ) val = -1;
  +        if ( 0 == val && getMicro() > other.getMicro() ) val = 1;
   
  -		return val;
  -	}
  +        return val;
  +    }
   }
  
  
  
  1.7       +37 -37    avalon/src/test/org/apache/avalon/framework/test/VersionTestCase.java
  
  Index: VersionTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/src/test/org/apache/avalon/framework/test/VersionTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VersionTestCase.java	20 May 2003 19:41:55 -0000	1.6
  +++ VersionTestCase.java	20 May 2003 19:46:31 -0000	1.7
  @@ -120,47 +120,47 @@
       
       public void testHashCode()
       {
  -    	final Version v1 = new Version( 5, 1, 0 );
  -    	final Version v2 = new Version( 1, 0, 3 );
  -    	final Version v3 = new Version( 1, 0, 3 );
  -    	
  -		assertEquals( calculateHash(v1), v1.hashCode() );
  -		assertEquals( calculateHash(v2), v2.hashCode() );
  -		
  -		assertTrue( v1.hashCode() != v2.hashCode() );
  -		assertTrue( ! v1.equals(v2) );
  -		
  -		assertEquals( v2.hashCode(), v3.hashCode() );
  -		assertEquals( v2, v3 );
  +        final Version v1 = new Version( 5, 1, 0 );
  +        final Version v2 = new Version( 1, 0, 3 );
  +        final Version v3 = new Version( 1, 0, 3 );
  +        
  +        assertEquals( calculateHash(v1), v1.hashCode() );
  +        assertEquals( calculateHash(v2), v2.hashCode() );
  +        
  +        assertTrue( v1.hashCode() != v2.hashCode() );
  +        assertTrue( ! v1.equals(v2) );
  +        
  +        assertEquals( v2.hashCode(), v3.hashCode() );
  +        assertEquals( v2, v3 );
       }
       
       public void testComparable()
       {
  -    	final Version v1 = new Version( 1, 0, 0 );
  -    	final Version v2 = new Version( 2, 0, 0 );
  -    	final Version v3 = new Version( 2, 1, 0 );
  -    	final Version v4 = new Version( 2, 1, 1 );
  -    	final Version v5 = new Version( 1, 0, 0 );
  -    	
  -    	assertEquals( 0, v1.compareTo(v5) );
  -    	assertEquals( 0, v5.compareTo(v1) );
  -    	
  -		assertEquals( -1, v1.compareTo(v2) );
  -		assertEquals( 1, v2.compareTo(v1) );
  -    	
  -		assertEquals( -1, v2.compareTo(v3) );
  -		assertEquals( 1, v3.compareTo(v2) );
  -    	
  -		assertEquals( -1, v3.compareTo(v4) );
  -		assertEquals( 1, v4.compareTo(v3) );
  +        final Version v1 = new Version( 1, 0, 0 );
  +        final Version v2 = new Version( 2, 0, 0 );
  +        final Version v3 = new Version( 2, 1, 0 );
  +        final Version v4 = new Version( 2, 1, 1 );
  +        final Version v5 = new Version( 1, 0, 0 );
  +        
  +        assertEquals( 0, v1.compareTo(v5) );
  +        assertEquals( 0, v5.compareTo(v1) );
  +        
  +        assertEquals( -1, v1.compareTo(v2) );
  +        assertEquals( 1, v2.compareTo(v1) );
  +        
  +        assertEquals( -1, v2.compareTo(v3) );
  +        assertEquals( 1, v3.compareTo(v2) );
  +        
  +        assertEquals( -1, v3.compareTo(v4) );
  +        assertEquals( 1, v4.compareTo(v3) );
       }
   
  -	private int calculateHash(final Version v) {
  -		int hash = v.getMajor();
  -		hash >>>= 17;
  -		hash += v.getMinor();
  -		hash >>>= 17;
  -		hash += v.getMicro();
  -		return hash;
  -	}
  +    private int calculateHash(final Version v) {
  +        int hash = v.getMajor();
  +        hash >>>= 17;
  +        hash += v.getMinor();
  +        hash >>>= 17;
  +        hash += v.getMicro();
  +        return hash;
  +    }
   }
  
  
  
  1.3       +28 -28    avalon/src/xdocs/guide-cop-in-avalon.xml
  
  Index: guide-cop-in-avalon.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/guide-cop-in-avalon.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- guide-cop-in-avalon.xml	11 Feb 2003 06:29:06 -0000	1.2
  +++ guide-cop-in-avalon.xml	20 May 2003 19:46:31 -0000	1.3
  @@ -203,13 +203,13 @@
         <section>
   <title>When you are done with the component</title>
           <p>
  -	  Both the ServiceManager and the ServiceSelector require you to
  -	  release your component when you are done with it.  The method used
  -	  to do this is "release".  One way of handling this is to use the
  -	  try/catch/finally construct.  For your convenience, the following
  -	  code can help:
  -	</p>
  -	<source>
  +      Both the ServiceManager and the ServiceSelector require you to
  +      release your component when you are done with it.  The method used
  +      to do this is "release".  One way of handling this is to use the
  +      try/catch/finally construct.  For your convenience, the following
  +      code can help:
  +    </p>
  +    <source>
   MyComponent component = null;
   
   try
  @@ -225,11 +225,11 @@
   {
       if (component != null) manager.release(component);
   }
  -	</source>
  -	<p>
  -	  The reason for this is so that smart component managers that
  -	  select components from a pool can properly manage the resources.
  -	</p>
  +    </source>
  +    <p>
  +      The reason for this is so that smart component managers that
  +      select components from a pool can properly manage the resources.
  +    </p>
         </section>
       </section>
   
  @@ -282,22 +282,22 @@
       </section>
       <section>
   <title>The Container</title>
  -    	<p>
  -		The container is the entity that manages your components. It handles
  -		things like loading of configuration files, resolution of dependencies,
  -		component management, component isolation, and lifecycle support.
  -	</p>
  -	<p>
  -		The container is not formalized in the form of an interface or contract
  -		within Avalon Framework, though it might be at some point in the future.
  -		The informal contract for the container is that it has the ability to
  -		host any fully Avalon-Framework compliant component. Most current containers
  -		place additional requirements on the component.
  -	</p>
  -	<p>
  -		For a list of container implementations,
  -		<link href="reference-containers.html">look here</link>.
  -	</p>
  +        <p>
  +        The container is the entity that manages your components. It handles
  +        things like loading of configuration files, resolution of dependencies,
  +        component management, component isolation, and lifecycle support.
  +    </p>
  +    <p>
  +        The container is not formalized in the form of an interface or contract
  +        within Avalon Framework, though it might be at some point in the future.
  +        The informal contract for the container is that it has the ability to
  +        host any fully Avalon-Framework compliant component. Most current containers
  +        place additional requirements on the component.
  +    </p>
  +    <p>
  +        For a list of container implementations,
  +        <link href="reference-containers.html">look here</link>.
  +    </p>
       </section>
     </body>
   </document>
  
  
  
  1.2       +10 -10    avalon/src/xdocs/guide-cop-what-is.xml
  
  Index: guide-cop-what-is.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/guide-cop-what-is.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- guide-cop-what-is.xml	5 Feb 2003 10:28:18 -0000	1.1
  +++ guide-cop-what-is.xml	20 May 2003 19:46:31 -0000	1.2
  @@ -29,16 +29,16 @@
   <title>COP is not just a Buzzword</title>
         <p>
           There is a lot of buzz in the industry touting Component Based Design
  -	(CBD).  You will find, that the definition of a component in Avalon
  -	is more formal than most companies' definition of a component.  Any
  -	system developed with the principles of Avalon can claim CBD.  In
  -	fact the Avalon Framework formalizes CBD more rigidly than the marketing
  -	definition.  Do not be fooled though, CBD and COP aren't necessarily
  -	the same thing.  Component Based Design refers to how a system is
  -	designed and not how it is implemented.  Component Oriented Programming,
  -	on the other hand, refers to how a system is implemented and not how
  -	it is designed.  In practice, you can't implement COP without first
  -	designing with components in mind.
  +    (CBD).  You will find, that the definition of a component in Avalon
  +    is more formal than most companies' definition of a component.  Any
  +    system developed with the principles of Avalon can claim CBD.  In
  +    fact the Avalon Framework formalizes CBD more rigidly than the marketing
  +    definition.  Do not be fooled though, CBD and COP aren't necessarily
  +    the same thing.  Component Based Design refers to how a system is
  +    designed and not how it is implemented.  Component Oriented Programming,
  +    on the other hand, refers to how a system is implemented and not how
  +    it is designed.  In practice, you can't implement COP without first
  +    designing with components in mind.
         </p>
       </section>
     </body>
  
  
  
  1.2       +16 -16    avalon/src/xdocs/guide-patterns-ioc-security.xml
  
  Index: guide-patterns-ioc-security.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/guide-patterns-ioc-security.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- guide-patterns-ioc-security.xml	5 Feb 2003 10:28:18 -0000	1.1
  +++ guide-patterns-ioc-security.xml	20 May 2003 19:46:31 -0000	1.2
  @@ -26,7 +26,7 @@
           that have been well defined: authentication, authorization, and
           architecture.  Why didn't I say encryption?  It is because
           encryption does not equal security.  It is only part of the whole
  -	system.
  +    system.
         </p>
         <section>
   <title>Authentication</title>
  @@ -164,24 +164,24 @@
           officer required that all the computers be placed on these huge power
           conditioners to reduce the Electro-Magnetic Interference (EMI) coming from the
           power line feedback of the computers.  His rationalization was that he was
  -	positive KGB agents had the technology that they could read the EMI interference
  -	on the power lines and read the bits on the computers.  In hindsight this is
  -	improbable; no one can identify the bits travelling on a computer from EMI in the
  -	power lines due to the level of noise (clocks, addressing lines,
  -	<em>encrypted data</em>, and other computers on the network).
  +    positive KGB agents had the technology that they could read the EMI interference
  +    on the power lines and read the bits on the computers.  In hindsight this is
  +    improbable; no one can identify the bits travelling on a computer from EMI in the
  +    power lines due to the level of noise (clocks, addressing lines,
  +    <em>encrypted data</em>, and other computers on the network).
         </p>
         <p>
           The security industry has a general rule of thumb to ensure that you don't spend
  -	too much time in this area:  The cost of cracking the server should be more than
  -	the information that is protected is worth.  Basically it boils down to this:
  -	sites like Slashdot and SourceForge do not require as much security as a bank.
  -	Protecting free information is not as critical as protecting people's bank accounts.
  -	I am not minimizing the contributions of the aforementioned sites to the world
  -	as a whole, but people become much more agitated if their bank account is wiped
  -	clean than if their news article is defaced.  This is not to say that if you are
  -	protecting free information then you can safely ignore security.  While the information
  -	is monetarily free to customers, it has value that can be measured in pride, respect,
  -	and accountability.
  +    too much time in this area:  The cost of cracking the server should be more than
  +    the information that is protected is worth.  Basically it boils down to this:
  +    sites like Slashdot and SourceForge do not require as much security as a bank.
  +    Protecting free information is not as critical as protecting people's bank accounts.
  +    I am not minimizing the contributions of the aforementioned sites to the world
  +    as a whole, but people become much more agitated if their bank account is wiped
  +    clean than if their news article is defaced.  This is not to say that if you are
  +    protecting free information then you can safely ignore security.  While the information
  +    is monetarily free to customers, it has value that can be measured in pride, respect,
  +    and accountability.
         </p>
         <p>
           The moral of the story is be paranoid to a point.  Avalon is designed to be
  
  
  
  1.2       +17 -17    avalon/src/xdocs/guide-patterns-ioc.xml
  
  Index: guide-patterns-ioc.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/guide-patterns-ioc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- guide-patterns-ioc.xml	5 Feb 2003 10:28:18 -0000	1.1
  +++ guide-patterns-ioc.xml	20 May 2003 19:46:31 -0000	1.2
  @@ -33,10 +33,10 @@
           <p>
             A designer sets up a chain among objects that can all react
             to certain messages in a delegation hierarchy.  There is one
  -	  major semantic detail: Inversion of Control refers to a parent
  -	  object <em>controlling</em> a child object.  With this distinction,
  -	  the SAX API is not considered Inversion of Control because its
  -	  purpose is to send <em>information</em> from a source to a handler.
  +      major semantic detail: Inversion of Control refers to a parent
  +      object <em>controlling</em> a child object.  With this distinction,
  +      the SAX API is not considered Inversion of Control because its
  +      purpose is to send <em>information</em> from a source to a handler.
           </p>
           <section>
   <title>Definition by Analogy</title>
  @@ -45,7 +45,7 @@
               understanding <em>Inversion of Control</em> easier.  We
               experience this in many different ways in regular life,
               so we are borrowing the form in code.  One analogy is called
  -	    the "Chain of Command" in the military.
  +        the "Chain of Command" in the military.
             </p>
             <section>
   <title>Chain of Command</title>
  @@ -60,17 +60,17 @@
                 instantiating entity then acts on that component how it
                 needs to act.
               </p>
  -	    <p>
  -	      There are some deficiencies in this analogy as some military
  -	      or ex-military people have explained to me.  In the military,
  -	      <strong>any</strong> Commanding Officer can issue commands to
  -	      anyone under his or her rank.  In the development world, to
  -	      ensure proper security, this is not a pattern you want in your
  -	      software.  In Avalon, Inversion of Control (IoC) is from one
  -	      parent (controlling) object to a child (controlled) component.
  -	      A parent may have many children, but children only have one
  -	      parent.
  -	    </p>
  +        <p>
  +          There are some deficiencies in this analogy as some military
  +          or ex-military people have explained to me.  In the military,
  +          <strong>any</strong> Commanding Officer can issue commands to
  +          anyone under his or her rank.  In the development world, to
  +          ensure proper security, this is not a pattern you want in your
  +          software.  In Avalon, Inversion of Control (IoC) is from one
  +          parent (controlling) object to a child (controlled) component.
  +          A parent may have many children, but children only have one
  +          parent.
  +        </p>
             </section>
           </section>
         </section>
  @@ -101,7 +101,7 @@
           <p>
             The parent of MyComponent instantiates MyComponent, sets the
             Logger, and calls myMethod.  The component is not autonomous,
  -	  and is given a logger that has been configured by the parent.
  +      and is given a logger that has been configured by the parent.
           </p>
           <p>
             The MyComponent class has no state apart from the parent, and
  
  
  
  1.2       +2 -2      avalon/src/xdocs/guide-patterns-what-are.xml
  
  Index: guide-patterns-what-are.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/guide-patterns-what-are.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- guide-patterns-what-are.xml	5 Feb 2003 10:28:18 -0000	1.1
  +++ guide-patterns-what-are.xml	20 May 2003 19:46:31 -0000	1.2
  @@ -36,11 +36,11 @@
   <link href="http://www6.software.ibm.com/developerworks/education/j-patterns/index.html">
             "Java Design Patterns 101"
           </link> at DeveloperWorks</li>
  -		<li>
  +        <li>
   <link href="http://www6.software.ibm.com/developerworks/education/j-patterns201/index.html">
             "Java Design Patterns 201"
           </link> at DeveloperWorks</li>
  -		<li>
  +        <li>
   <link href="http://cseng.aw.com/book/0,3828,0201633612,00.html">
             "Java Design Patterns: Elements of Reusable Object-Oriented Software"
           </link> by the GoF (printed book)</li>
  
  
  
  1.2       +49 -49    avalon/src/xdocs/reference-containers.xml
  
  Index: reference-containers.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/reference-containers.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- reference-containers.xml	5 Feb 2003 10:28:18 -0000	1.1
  +++ reference-containers.xml	20 May 2003 19:46:31 -0000	1.2
  @@ -13,7 +13,7 @@
   <title>Introduction</title>
         <p>
           There are various containers that are aware of the Avalon Framework interfaces.
  -	This is a sort-of comprehensive list.
  +    This is a sort-of comprehensive list.
         </p>
       </section>
       <section>
  @@ -26,38 +26,38 @@
           <p>
             This is a sister project to Avalon Framework.  It provides an environment
             for launching multiple, isolated, more or less unrestricted server applications
  -	  as hosted components.  These can be applications like a web server, RDBMS or
  -	  EJB server. It provides many advanced features like automatic management, at the
  -	  cost of a bit of complexity.
  +      as hosted components.  These can be applications like a web server, RDBMS or
  +      EJB server. It provides many advanced features like automatic management, at the
  +      cost of a bit of complexity.
             See <link href="http://avalon.apache.org/phoenix/index.html">Phoenix</link>.
           </p>
   
  -	<p>
  -	  Phoenix is the oldest of the Avalon Containers; it is probably the most powerful
  -	  and most widely used. While still in alpha, this hints at the fact that we find it
  -	  to be not completely future complete, rather than an infantile project.
  -	</p>
  +    <p>
  +      Phoenix is the oldest of the Avalon Containers; it is probably the most powerful
  +      and most widely used. While still in alpha, this hints at the fact that we find it
  +      to be not completely future complete, rather than an infantile project.
  +    </p>
         </section>
   
  -	<section>
  +    <section>
   <title>Avalon Excalibur's Tweety</title>
  -	<p>
  -	Tweety is almost the opposite of Phoenix. It is a recent development and written
  -	exclusively as a teaching tool. It has no features whatsoever besides basic support
  -	for the Avalon lifecycle. This results in a complete distribution the size of the
  -	Phoenix bootstrapper.
  -	See <link href="http://avalon.apache.org/excalibur/tweety">Tweety</link>
  -	</p>
  -	</section>
  +    <p>
  +    Tweety is almost the opposite of Phoenix. It is a recent development and written
  +    exclusively as a teaching tool. It has no features whatsoever besides basic support
  +    for the Avalon lifecycle. This results in a complete distribution the size of the
  +    Phoenix bootstrapper.
  +    See <link href="http://avalon.apache.org/excalibur/tweety">Tweety</link>
  +    </p>
  +    </section>
   
  -	<section>
  +    <section>
   <title>Myrmidon</title>
  -	<p>
  -	Myrmidon is a proposal for the kernel of
  -	<link href="http://jakarta.apache.org/ant">Apache Ant</link> 2.
  -	See <link href="http://cvs.apache.org/viewcvs.cgi/jakarta-ant/proposal/myrmidon/">Myrmidon</link>
  -	</p>
  -	</section>
  +    <p>
  +    Myrmidon is a proposal for the kernel of
  +    <link href="http://jakarta.apache.org/ant">Apache Ant</link> 2.
  +    See <link href="http://cvs.apache.org/viewcvs.cgi/jakarta-ant/proposal/myrmidon/">Myrmidon</link>
  +    </p>
  +    </section>
       </section>
       <section>
   <title>Embedded Containers</title>
  @@ -70,43 +70,43 @@
             This is used by various applications like Cocoon. Cocoon is run inside the
             Sun specified servlet context of a web-app.  It is designed for such
             servlet-context reuse. ECM is the most stable of the containers (it is the
  -	  only one with a stable release); it is also arguably the worst design.
  -	  See <link href="http://avalon.apache.org/excalibur/component/">ECM</link>.
  +      only one with a stable release); it is also arguably the worst design.
  +      See <link href="http://avalon.apache.org/excalibur/component/">ECM</link>.
           </p>
         </section>
         <section>
   <title>Fortress</title>
           <p>
             Fortress is meant as a future replacement of ECM. It fixes several of ECMs flaws
  -	  like a mixup of concerns. It is built to be very extensible, and it includes
  -	  support for custom lifecycle extensions. Fortress is still pre-alpha.
  -	  See <link href="http://avalon.apache.org/excalibur/fortress/">Fortress</link>.
  +      like a mixup of concerns. It is built to be very extensible, and it includes
  +      support for custom lifecycle extensions. Fortress is still pre-alpha.
  +      See <link href="http://avalon.apache.org/excalibur/fortress/">Fortress</link>.
           </p>
         </section>
         <section>
   <title>Merlin</title>
           <p>
             Another recent development is Merlin, which has a client API very similar to
  -	  Phoenix (applications that can run within phoenix can run within merlin as
  -	  well). Merlin is still pre-alpha.
  -	</p>
  -	<p>
  -	  See <link href="http://home.osm.net/doc/merlin/index.html">Merlin</link>.
  +      Phoenix (applications that can run within phoenix can run within merlin as
  +      well). Merlin is still pre-alpha.
  +    </p>
  +    <p>
  +      See <link href="http://home.osm.net/doc/merlin/index.html">Merlin</link>.
           </p>
         </section>
         <section>
   <title>Plexus</title>
           <p>
             Plexus is a container under development that will become the basis of the
  -	  services framework for a sister project to Avalon,
  -	  <link href="http://jakarta.apache.org/turbine">Turbine</link>.
  +      services framework for a sister project to Avalon,
  +      <link href="http://jakarta.apache.org/turbine">Turbine</link>.
           </p>
  -	<p>
  -		See <link href="http://tambora.zenplex.org/cgi-bin/cvsweb.cgi/plexus/">Plexus</link>.
  -	</p>
  -	<note>
  -	Plexus is being developed outside of Avalon itself as an external project.
  -	</note>
  +    <p>
  +        See <link href="http://tambora.zenplex.org/cgi-bin/cvsweb.cgi/plexus/">Plexus</link>.
  +    </p>
  +    <note>
  +    Plexus is being developed outside of Avalon itself as an external project.
  +    </note>
         </section>
         <section>
   <title>Enterprise Object Broker (EOB)</title>
  @@ -116,12 +116,12 @@
             RPC publishing of arbitary interfaces apparent in a hosted components object
             model.
           </p>
  -	<p>
  -		  See <link href="http://eob.sourceforge.net/">EOB</link>.
  -	</p>
  -	<note>
  -	EOB is an being developed outside of Avalon itself as an external project.
  -	</note>
  +    <p>
  +          See <link href="http://eob.sourceforge.net/">EOB</link>.
  +    </p>
  +    <note>
  +    EOB is an being developed outside of Avalon itself as an external project.
  +    </note>
         </section>
        </section>
     </body>
  
  
  
  1.3       +1 -1      avalon/src/xdocs/tabs.xml
  
  Index: tabs.xml
  ===================================================================
  RCS file: /home/cvs/avalon/src/xdocs/tabs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tabs.xml	16 Apr 2003 08:24:06 -0000	1.2
  +++ tabs.xml	20 May 2003 19:46:31 -0000	1.3
  @@ -11,4 +11,4 @@
           <tab label="Components" href="http://avalon.apache.org/components/"/>
           <tab label="Phoenix" href="http://avalon.apache.org/phoenix/"/>
           <tab label="SECA" href="http://avalon.apache.org/seca/"/>
  -    </tabs>
  \ No newline at end of file
  +    </tabs>
  
  
  
  1.4       +59 -59    avalon/tools/announcement.xml
  
  Index: announcement.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tools/announcement.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- announcement.xml	10 Feb 2003 18:10:56 -0000	1.3
  +++ announcement.xml	20 May 2003 19:46:32 -0000	1.4
  @@ -1,59 +1,59 @@
  -<?xml version="1.0"?>
  -
  -<announcement>
  -  <title>@Name@ @version@</title>
  -  <abstract>The Avalon team is proud to announce the @version@ @status@ release
  -of the @Name@.</abstract>
  -
  -  <project site="http://jakarta.apache.org/avalon">
  -    <title>Avalon</title>
  -    <description>
  -      The Avalon project is Apache's Java Server Framework. It is
  -      separated into five sub projects: Framework, Excalibur, LogKit,
  -      Cornerstone, and Phoenix. Its purpose is to simplify
  -      server side programming for Java based projects.  It
  -      formalizes serveral best of breed practices and patterns for
  -      server side programming.
  -    </description>
  -  </project>
  -
  -  <project site="http://jakarta.apache.org/avalon/@name@">
  -    <title>@Name@ @version@</title>
  -    <description>
  -      <para>
  -        The Avalon Framework formalizes the contracts and patterns used in the 
  -        other Avalon projects. It is derived from modern software engineering
  -        techniques and aims to provide a solid basis on which to build server
  -        products.
  -      </para>
  -      <para>
  -        What that means is that we define the central interface Component.  We
  -	also define the relationship (contract) a component has with peers,
  -	ancestors and children. This documentation introduces you to those
  -	patterns, interfaces, and relationships.
  -      </para>
  -      <para>
  -        The Avalon Framework raises the abstraction level from Object-Oriented
  -	Programming concept one notch to the Component-Oriented Programming
  -	model.  This enables programmers to concern themselves with assemblies
  -	of classes, rather than the classes themselves--thus reducing the
  -	number of things the programmer must keep in mind, and speeding up
  -	application development.
  -      </para>
  -      <para>
  -        The Avalon Framework is already used in
  -	<ulink uri="http://xml.apache.org/cocoon">Cocoon</ulink>, an XML
  -	publishing framework.  The Avalon Framework is also used in
  -	<ulink uri="http://jakarta.apache.org/james">Apache JAMES</ulink>, a
  -	Java(tm) Mail Server.  Another project that is built on Avalon Framework
  -	is <ulink uri="http://www.jesktop.org">Jestkop</ulink>, a cross-platform
  -	replacement for your ordinary desktop.  If you are evaluating Avalon
  -	and want the proof that it's claims are valid check them out.
  -      </para>
  -    </description>
  -    <changes version="@version@" file="changes.xml"/>
  -    <downloads name="Avalon" base="http://avalon.apache.org/bindownload.cgi"/>
  -  </project>
  -
  -</announcement>
  -
  +<?xml version="1.0"?>
  +
  +<announcement>
  +  <title>@Name@ @version@</title>
  +  <abstract>The Avalon team is proud to announce the @version@ @status@ release
  +of the @Name@.</abstract>
  +
  +  <project site="http://jakarta.apache.org/avalon">
  +    <title>Avalon</title>
  +    <description>
  +      The Avalon project is Apache's Java Server Framework. It is
  +      separated into five sub projects: Framework, Excalibur, LogKit,
  +      Cornerstone, and Phoenix. Its purpose is to simplify
  +      server side programming for Java based projects.  It
  +      formalizes serveral best of breed practices and patterns for
  +      server side programming.
  +    </description>
  +  </project>
  +
  +  <project site="http://jakarta.apache.org/avalon/@name@">
  +    <title>@Name@ @version@</title>
  +    <description>
  +      <para>
  +        The Avalon Framework formalizes the contracts and patterns used in the 
  +        other Avalon projects. It is derived from modern software engineering
  +        techniques and aims to provide a solid basis on which to build server
  +        products.
  +      </para>
  +      <para>
  +        What that means is that we define the central interface Component.  We
  +    also define the relationship (contract) a component has with peers,
  +    ancestors and children. This documentation introduces you to those
  +    patterns, interfaces, and relationships.
  +      </para>
  +      <para>
  +        The Avalon Framework raises the abstraction level from Object-Oriented
  +    Programming concept one notch to the Component-Oriented Programming
  +    model.  This enables programmers to concern themselves with assemblies
  +    of classes, rather than the classes themselves--thus reducing the
  +    number of things the programmer must keep in mind, and speeding up
  +    application development.
  +      </para>
  +      <para>
  +        The Avalon Framework is already used in
  +    <ulink uri="http://xml.apache.org/cocoon">Cocoon</ulink>, an XML
  +    publishing framework.  The Avalon Framework is also used in
  +    <ulink uri="http://jakarta.apache.org/james">Apache JAMES</ulink>, a
  +    Java(tm) Mail Server.  Another project that is built on Avalon Framework
  +    is <ulink uri="http://www.jesktop.org">Jestkop</ulink>, a cross-platform
  +    replacement for your ordinary desktop.  If you are evaluating Avalon
  +    and want the proof that it's claims are valid check them out.
  +      </para>
  +    </description>
  +    <changes version="@version@" file="changes.xml"/>
  +    <downloads name="Avalon" base="http://avalon.apache.org/bindownload.cgi"/>
  +  </project>
  +
  +</announcement>
  +
  
  
  
  1.3       +148 -148  avalon/tools/idea.code.style.xml
  
  Index: idea.code.style.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tools/idea.code.style.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- idea.code.style.xml	5 Aug 2002 13:23:59 -0000	1.2
  +++ idea.code.style.xml	20 May 2003 19:46:32 -0000	1.3
  @@ -1,148 +1,148 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<!--
  -  This is a code.style.xml document for IDEA (http://www.intellij.com)
  -
  -  To use copy it into $IDEA_HOME/config/options/code.style.xml
  -  This will overwrite any existing code style you have. Be sure
  -  to modify this version to include your name on all new classes.
  --->
  -<application>
  -  <component class="com.intellij.psi.codeStyle.CodeStyleManager">
  -    <option name="LINE_SEPARATOR" />
  -    <option name="INDENT_SIZE" value="4" />
  -    <option name="CONTINUATION_INDENT_SIZE" value="4" />
  -    <option name="KEEP_LINE_BREAKS" value="true" />
  -    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
  -    <option name="TAB_SIZE" value="1" />
  -    <option name="USE_TAB_CHARACTER" value="false" />
  -    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="true" />
  -    <option name="BRACE_STYLE" value="2" />
  -    <option name="CLASS_BRACE_STYLE" value="2" />
  -    <option name="METHOD_BRACE_STYLE" value="2" />
  -    <option name="ELSE_ON_NEW_LINE" value="true" />
  -    <option name="WHILE_ON_NEW_LINE" value="false" />
  -    <option name="CATCH_ON_NEW_LINE" value="true" />
  -    <option name="FINALLY_ON_NEW_LINE" value="true" />
  -    <option name="INDENT_CASE_FROM_SWITCH" value="true" />
  -    <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
  -    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
  -    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
  -    <option name="ALIGN_MULTILINE_FOR" value="true" />
  -    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
  -    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  -    <option name="BLANK_LINES_BEFORE_PACKAGE" value="0" />
  -    <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
  -    <option name="BLANK_LINES_BEFORE_IMPORTS" value="1" />
  -    <option name="BLANK_LINES_AFTER_IMPORTS" value="1" />
  -    <option name="BLANK_LINES_AROUND_CLASS" value="0" />
  -    <option name="BLANK_LINES_AROUND_FIELD" value="0" />
  -    <option name="BLANK_LINES_AROUND_METHOD" value="1" />
  -    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
  -    <option name="SPACE_AROUND_ASSIGNMENT_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_LOGICAL_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_EQUALITY_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_RELATIONAL_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_BITWISE_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_ADDITIVE_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_MULTIPLICATIVE_OPERATORS" value="true" />
  -    <option name="SPACE_AROUND_SHIFT_OPERATORS" value="true" />
  -    <option name="SPACE_AFTER_COMMA" value="true" />
  -    <option name="SPACE_BEFORE_COMMA" value="false" />
  -    <option name="SPACE_AFTER_SEMICOLON" value="true" />
  -    <option name="SPACE_BEFORE_SEMICOLON" value="false" />
  -    <option name="SPACE_WITHIN_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_METHOD_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_CATCH_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_SYNCHRONIZED_PARENTHESES" value="true" />
  -    <option name="SPACE_WITHIN_CAST_PARENTHESES" value="false" />
  -    <option name="SPACE_WITHIN_BRACKETS" value="true" />
  -    <option name="SPACE_AFTER_TYPE_CAST" value="false" />
  -    <option name="SPACE_BEFORE_METHOD_CALL_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
  -    <option name="SPACE_BEFORE_CLASS_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_METHOD_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_IF_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_ELSE_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_WHILE_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_FOR_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_DO_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_SWITCH_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_TRY_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_CATCH_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_FINALLY_LBRACE" value="true" />
  -    <option name="SPACE_BEFORE_SYNCHRONIZED_LBRACE" value="true" />
  -    <option name="CLASS_TEMPLATE" value="/*&#10; * Copyright (C) The Apache Software Foundation. All rights reserved.&#10; *&#10; * This software is published under the terms of the Apache Software License&#10; * version 1.1, a copy of which has been included  with this distribution in&#10; * the LICENSE.txt file.&#10; */&#10;package $PACKAGE_NAME$;&#10;&#10;/**&#10; * &#10; *&#10; * @author &lt;a href=&quot;mailto:peter at apache.org&quot;&gt;Peter Donald&lt;/a&gt;&#10; * @version $Revision$ $Date$&#10; */&#10;public class $NAME$ { }&#10;" />
  -    <option name="ADJUST_CLASS_TEMPLATE" value="true" />
  -    <option name="INTERFACE_TEMPLATE" value="/*&#10; * Copyright (C) The Apache Software Foundation. All rights reserved.&#10; *&#10; * This software is published under the terms of the Apache Software License&#10; * version 1.1, a copy of which has been included  with this distribution in&#10; * the LICENSE.txt file.&#10; */&#10;package $PACKAGE_NAME$;&#10;&#10;/**&#10; * &#10; *&#10; * @author &lt;a href=&quot;mailto:peter at apache.org&quot;&gt;Peter Donald&lt;/a&gt;&#10; * @version $Revision$ $Date$&#10; */&#10;public interface $NAME$ { }&#10;" />
  -    <option name="ADJUST_INTERFACE_TEMPLATE" value="true" />
  -    <option name="FIELD_NAME_PREFIX" value="m_" />
  -    <option name="STATIC_FIELD_NAME_PREFIX" value="c_" />
  -    <option name="PARAMETER_NAME_PREFIX" value="" />
  -    <option name="LOCAL_VARIABLE_NAME_PREFIX" value="" />
  -    <option name="FIELD_TYPE_TO_NAME">
  -      <value />
  -    </option>
  -    <option name="STATIC_FIELD_TYPE_TO_NAME">
  -      <value />
  -    </option>
  -    <option name="PARAMETER_TYPE_TO_NAME">
  -      <value>
  -        <pair name="i" type="int" />
  -        <pair name="b" type="byte" />
  -        <pair name="c" type="char" />
  -        <pair name="l" type="long" />
  -        <pair name="i" type="short" />
  -        <pair name="b" type="boolean" />
  -        <pair name="v" type="double" />
  -        <pair name="v" type="float" />
  -        <pair name="o" type="java.lang.Object" />
  -        <pair name="s" type="java.lang.String" />
  -        <pair name="e" type="*Exception" />
  -        <pair name="event" type="*Event" />
  -      </value>
  -    </option>
  -    <option name="LOCAL_VARIABLE_TYPE_TO_NAME">
  -      <value>
  -        <pair name="i" type="int" />
  -        <pair name="b" type="byte" />
  -        <pair name="c" type="char" />
  -        <pair name="l" type="long" />
  -        <pair name="i" type="short" />
  -        <pair name="b" type="boolean" />
  -        <pair name="v" type="double" />
  -        <pair name="v" type="float" />
  -        <pair name="o" type="java.lang.Object" />
  -        <pair name="s" type="java.lang.String" />
  -        <pair name="event" type="*Event" />
  -      </value>
  -    </option>
  -    <option name="USE_FQ_CLASS_NAMES" value="false" />
  -    <option name="USE_SINGLE_CLASS_IMPORTS" value="true" />
  -    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="15454" />
  -    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
  -      <value />
  -    </option>
  -    <option name="IMPORT_LAYOUT_TABLE">
  -      <value>
  -        <package name="" withSubpackages="true" />
  -        <emptyLine />
  -      </value>
  -    </option>
  -    <option name="FIELDS_ORDER_WEIGHT" value="1" />
  -    <option name="METHODS_ORDER_WEIGHT" value="3" />
  -    <option name="CONSTRUCTORS_ORDER_WEIGHT" value="2" />
  -    <option name="INNER_CLASSES_ORDER_WEIGHT" value="4" />
  -  </component>
  -</application>
  -
  +<?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  This is a code.style.xml document for IDEA (http://www.intellij.com)
  +
  +  To use copy it into $IDEA_HOME/config/options/code.style.xml
  +  This will overwrite any existing code style you have. Be sure
  +  to modify this version to include your name on all new classes.
  +-->
  +<application>
  +  <component class="com.intellij.psi.codeStyle.CodeStyleManager">
  +    <option name="LINE_SEPARATOR" />
  +    <option name="INDENT_SIZE" value="4" />
  +    <option name="CONTINUATION_INDENT_SIZE" value="4" />
  +    <option name="KEEP_LINE_BREAKS" value="true" />
  +    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
  +    <option name="TAB_SIZE" value="1" />
  +    <option name="USE_TAB_CHARACTER" value="false" />
  +    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="true" />
  +    <option name="BRACE_STYLE" value="2" />
  +    <option name="CLASS_BRACE_STYLE" value="2" />
  +    <option name="METHOD_BRACE_STYLE" value="2" />
  +    <option name="ELSE_ON_NEW_LINE" value="true" />
  +    <option name="WHILE_ON_NEW_LINE" value="false" />
  +    <option name="CATCH_ON_NEW_LINE" value="true" />
  +    <option name="FINALLY_ON_NEW_LINE" value="true" />
  +    <option name="INDENT_CASE_FROM_SWITCH" value="true" />
  +    <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
  +    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
  +    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
  +    <option name="ALIGN_MULTILINE_FOR" value="true" />
  +    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
  +    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
  +    <option name="BLANK_LINES_BEFORE_PACKAGE" value="0" />
  +    <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
  +    <option name="BLANK_LINES_BEFORE_IMPORTS" value="1" />
  +    <option name="BLANK_LINES_AFTER_IMPORTS" value="1" />
  +    <option name="BLANK_LINES_AROUND_CLASS" value="0" />
  +    <option name="BLANK_LINES_AROUND_FIELD" value="0" />
  +    <option name="BLANK_LINES_AROUND_METHOD" value="1" />
  +    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
  +    <option name="SPACE_AROUND_ASSIGNMENT_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_LOGICAL_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_EQUALITY_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_RELATIONAL_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_BITWISE_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_ADDITIVE_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_MULTIPLICATIVE_OPERATORS" value="true" />
  +    <option name="SPACE_AROUND_SHIFT_OPERATORS" value="true" />
  +    <option name="SPACE_AFTER_COMMA" value="true" />
  +    <option name="SPACE_BEFORE_COMMA" value="false" />
  +    <option name="SPACE_AFTER_SEMICOLON" value="true" />
  +    <option name="SPACE_BEFORE_SEMICOLON" value="false" />
  +    <option name="SPACE_WITHIN_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_METHOD_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_CATCH_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_SYNCHRONIZED_PARENTHESES" value="true" />
  +    <option name="SPACE_WITHIN_CAST_PARENTHESES" value="false" />
  +    <option name="SPACE_WITHIN_BRACKETS" value="true" />
  +    <option name="SPACE_AFTER_TYPE_CAST" value="false" />
  +    <option name="SPACE_BEFORE_METHOD_CALL_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
  +    <option name="SPACE_BEFORE_CLASS_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_METHOD_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_IF_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_ELSE_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_WHILE_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_FOR_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_DO_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_SWITCH_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_TRY_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_CATCH_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_FINALLY_LBRACE" value="true" />
  +    <option name="SPACE_BEFORE_SYNCHRONIZED_LBRACE" value="true" />
  +    <option name="CLASS_TEMPLATE" value="/*&#10; * Copyright (C) The Apache Software Foundation. All rights reserved.&#10; *&#10; * This software is published under the terms of the Apache Software License&#10; * version 1.1, a copy of which has been included  with this distribution in&#10; * the LICENSE.txt file.&#10; */&#10;package $PACKAGE_NAME$;&#10;&#10;/**&#10; * &#10; *&#10; * @author &lt;a href=&quot;mailto:peter at apache.org&quot;&gt;Peter Donald&lt;/a&gt;&#10; * @version $Revision$ $Date$&#10; */&#10;public class $NAME$ { }&#10;" />
  +    <option name="ADJUST_CLASS_TEMPLATE" value="true" />
  +    <option name="INTERFACE_TEMPLATE" value="/*&#10; * Copyright (C) The Apache Software Foundation. All rights reserved.&#10; *&#10; * This software is published under the terms of the Apache Software License&#10; * version 1.1, a copy of which has been included  with this distribution in&#10; * the LICENSE.txt file.&#10; */&#10;package $PACKAGE_NAME$;&#10;&#10;/**&#10; * &#10; *&#10; * @author &lt;a href=&quot;mailto:peter at apache.org&quot;&gt;Peter Donald&lt;/a&gt;&#10; * @version $Revision$ $Date$&#10; */&#10;public interface $NAME$ { }&#10;" />
  +    <option name="ADJUST_INTERFACE_TEMPLATE" value="true" />
  +    <option name="FIELD_NAME_PREFIX" value="m_" />
  +    <option name="STATIC_FIELD_NAME_PREFIX" value="c_" />
  +    <option name="PARAMETER_NAME_PREFIX" value="" />
  +    <option name="LOCAL_VARIABLE_NAME_PREFIX" value="" />
  +    <option name="FIELD_TYPE_TO_NAME">
  +      <value />
  +    </option>
  +    <option name="STATIC_FIELD_TYPE_TO_NAME">
  +      <value />
  +    </option>
  +    <option name="PARAMETER_TYPE_TO_NAME">
  +      <value>
  +        <pair name="i" type="int" />
  +        <pair name="b" type="byte" />
  +        <pair name="c" type="char" />
  +        <pair name="l" type="long" />
  +        <pair name="i" type="short" />
  +        <pair name="b" type="boolean" />
  +        <pair name="v" type="double" />
  +        <pair name="v" type="float" />
  +        <pair name="o" type="java.lang.Object" />
  +        <pair name="s" type="java.lang.String" />
  +        <pair name="e" type="*Exception" />
  +        <pair name="event" type="*Event" />
  +      </value>
  +    </option>
  +    <option name="LOCAL_VARIABLE_TYPE_TO_NAME">
  +      <value>
  +        <pair name="i" type="int" />
  +        <pair name="b" type="byte" />
  +        <pair name="c" type="char" />
  +        <pair name="l" type="long" />
  +        <pair name="i" type="short" />
  +        <pair name="b" type="boolean" />
  +        <pair name="v" type="double" />
  +        <pair name="v" type="float" />
  +        <pair name="o" type="java.lang.Object" />
  +        <pair name="s" type="java.lang.String" />
  +        <pair name="event" type="*Event" />
  +      </value>
  +    </option>
  +    <option name="USE_FQ_CLASS_NAMES" value="false" />
  +    <option name="USE_SINGLE_CLASS_IMPORTS" value="true" />
  +    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="15454" />
  +    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
  +      <value />
  +    </option>
  +    <option name="IMPORT_LAYOUT_TABLE">
  +      <value>
  +        <package name="" withSubpackages="true" />
  +        <emptyLine />
  +      </value>
  +    </option>
  +    <option name="FIELDS_ORDER_WEIGHT" value="1" />
  +    <option name="METHODS_ORDER_WEIGHT" value="3" />
  +    <option name="CONSTRUCTORS_ORDER_WEIGHT" value="2" />
  +    <option name="INNER_CLASSES_ORDER_WEIGHT" value="4" />
  +  </component>
  +</application>
  +
  
  
  

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