svn commit: r232411 - in /beehive/trunk: LICENSE.TXT LICENSE.txt NOTICE.txt

[ek...@apache.org]

Author: ekoneil
Date: Fri Aug 12 17:51:42 2005
New Revision: 232411

URL: http://svn.apache.org/viewcvs?rev=232411&view=rev
Log:
Changing the NOTICE.txt file to look like some other Apache projects.

Still need to add the relevant info for the JSR 173 JAR file...as soon as I find where Cezar put this in the XMLBeans tree.

BB: self
DRT: none


Added:
    beehive/trunk/LICENSE.txt
      - copied unchanged from r231530, beehive/trunk/LICENSE.TXT
Removed:
    beehive/trunk/LICENSE.TXT
Modified:
    beehive/trunk/NOTICE.txt

Modified: beehive/trunk/NOTICE.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/NOTICE.txt?rev=232411&r1=232410&r2=232411&view=diff
==============================================================================
--- beehive/trunk/NOTICE.txt (original)
+++ beehive/trunk/NOTICE.txt Fri Aug 12 17:51:42 2005
@@ -1,18 +1,25 @@
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-   
-Portions of this software were developed BEA Systems 
-Inc., <http://www.bea.com/>, copyright (c) 2000-2005. 
-
-Aside from contributions to the Apache Beehive project, this 
-software also includes:
-
-- various other products from the Apache Software Foundation,
-such as: Ant, Log4J, Tomcat, Velocity, and XMLBeans.
-
-- JUnit
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
-
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Beehive distribution.     ==
+=========================================================================
+
+This product includes software developed by 
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+ - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+and are licensed to the Apache Software Foundation under the 
+"Software Grand and Corporate Contribution License Agreement".   
+
+Aside from contributions to the Apache Beehive project, this 
+software also includes:
+
+  - one or more JARs from the Apache products:
+    - Ant, Axis, Log4J, Tomcat, Velocity, and XMLBeans.
+  Copyright (c) 1999-2005 Apache Software Foundation
+
+  - TODO: add JSR 173 license
+
+See the LICENSE.txt file for information on all licenses 
+associated with this software.
+