You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ne...@apache.org on 2003/12/01 19:01:31 UTC

cvs commit: avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools Component.java ComponentMetaInfoCollector.java Service.java

neeme       2003/12/01 10:01:31

  Modified:    fortress/tools/src/java/org/apache/avalon/fortress/tools
                        Component.java ComponentMetaInfoCollector.java
                        Service.java
  Log:
  removed reference to D-Haven from the license: it seems to be a copy-paste issue from D-Haven CVS
  
  Revision  Changes    Path
  1.18      +4 -4      avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java
  
  Index: Component.java
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Component.java	8 Jul 2003 12:29:18 -0000	1.17
  +++ Component.java	1 Dec 2003 18:01:30 -0000	1.18
  @@ -24,9 +24,9 @@
    *    itself, if and wherever such third-party acknowledgments
    *    normally appear.
    *
  - * 4. The names "D-Haven" and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  + * 4. The names "Jakarta", "Avalon", "Excalibur" 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",
  
  
  
  1.25      +4 -4      avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/ComponentMetaInfoCollector.java
  
  Index: ComponentMetaInfoCollector.java
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/ComponentMetaInfoCollector.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ComponentMetaInfoCollector.java	28 May 2003 13:00:21 -0000	1.24
  +++ ComponentMetaInfoCollector.java	1 Dec 2003 18:01:30 -0000	1.25
  @@ -24,9 +24,9 @@
    *    itself, if and wherever such third-party acknowledgments
    *    normally appear.
    *
  - * 4. The names "D-Haven" and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  + * 4. The names "Jakarta", "Avalon", "Excalibur" 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",
  
  
  
  1.9       +4 -4      avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Service.java
  
  Index: Service.java
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Service.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Service.java	15 May 2003 18:56:28 -0000	1.8
  +++ Service.java	1 Dec 2003 18:01:30 -0000	1.9
  @@ -24,9 +24,9 @@
    *    itself, if and wherever such third-party acknowledgments
    *    normally appear.
    *
  - * 4. The names "D-Haven" and "Apache Software Foundation"
  - *    must not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  + * 4. The names "Jakarta", "Avalon", "Excalibur" 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",
  
  
  

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