jkeyes      2003/10/31 14:16:52

  Modified:    cli/src/java/org/apache/commons/cli2 DefaultOption.java
  Log:
  
- fixed Apache license
  
  Revision  Changes    Path
  1.6       +20 -15    
jakarta-commons-sandbox/cli/src/java/org/apache/commons/cli2/DefaultOption.java
  
  Index: DefaultOption.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/cli/src/java/org/apache/commons/cli2/DefaultOption.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultOption.java        31 Oct 2003 22:12:54 -0000      1.5
  +++ DefaultOption.java        31 Oct 2003 22:16:52 -0000      1.6
  @@ -11,23 +11,28 @@
    * 
    * Redistribution and use in source and binary forms, with or without
    * modification, 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.
  + *     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.
  + *     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 acknowlegement: "This product includes software
  - * developed by the Apache Software Foundation (http://www.apache.org/)."
  - * Alternately, this acknowlegement may appear in the software itself, if and
  - * wherever such third-party acknowlegements normally appear.
  + *     must include the following acknowlegement: "This product includes software
  + *     developed by the Apache Software Foundation (http://www.apache.org/)."
  + *     Alternately, this acknowlegement may appear in the software itself, if and
  + *     wherever such third-party acknowlegements normally appear.
  + * 
    *  4. The names "The Jakarta Project", "Commons", 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 [EMAIL PROTECTED]
  + *     Foundation" must not be used to endorse or promote products derived from
  + *     this software without prior written permission. For written permission,
  + *     please contact [EMAIL PROTECTED]
  + * 
    *  5. Products derived from this software may not be called "Apache" nor may
  - * "Apache" appear in their names without prior written permission of the
  - * Apache GroupImpl.
  + *     "Apache" appear in their names without prior written permission of the
  + *     Apache Group.
    * 
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to