You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/28 00:56:10 UTC
cvs commit: avalon-sandbox/merlin/merlin-extensions .cvsignore LICENSE.txt
mcconnell 2003/06/27 15:56:10
Modified: merlin/merlin-extensions .cvsignore LICENSE.txt
Log:
License update.
Revision Changes Path
1.2 +1 -0 avalon-sandbox/merlin/merlin-extensions/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Jun 2003 04:12:23 -0000 1.1
+++ .cvsignore 27 Jun 2003 22:56:10 -0000 1.2
@@ -2,3 +2,4 @@
velocity.log
build.properties
target
+*.zip
\ No newline at end of file
1.2 +8 -6 avalon-sandbox/merlin/merlin-extensions/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.txt 24 Jun 2003 21:58:54 -0000 1.1
+++ LICENSE.txt 27 Jun 2003 22:56:10 -0000 1.2
@@ -2,7 +2,8 @@
The Apache Software License, Version 1.1
============================================================================
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 1997-2003 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:
@@ -20,10 +21,10 @@
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.
+ 4. The names "Apache", "Avalon", "Excalibur", "Fortress", "Phoenix",
+ "Merlin" 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
@@ -42,4 +43,5 @@
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/>.
+ Apache Software Foundation, please see http://www.apache.org/.
+
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org