Author: dkulp
Date: Wed Apr 23 14:22:27 2008
New Revision: 651068
URL: http://svn.apache.org/viewvc?rev=651068&view=rev
Log:
Merged revisions 650926 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r650926 | dkulp | 2008-04-23 12:10:14 -0400 (Wed, 23 Apr 2008) | 2 lines
More legal wrangling
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/NOTICE
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/NOTICE?rev=651068&r1=651067&r2=651068&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/NOTICE
(original)
+++
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/NOTICE
Wed Apr 23 14:22:27 2008
@@ -11,30 +11,35 @@
(http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm.xsd)
(http://www.w3.org/2005/08/addressing/ws-addr.xsd)
-This product also includes MTOSI wsdl and schemas developed by the
-TeleManagement Forum (http://www.tmforum.org/browse.aspx). The original
-MTOSI wsdl and schemas can be download from
-(http://sourceforge.net/projects/mtosi-ri)
+
+The product contains code (StaxBuilder.java) that is
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ See the NOTICE.jdom file for additional information
Java classes (source and binary) under org.apache.cxf.jaxws.javaee
are generated from schema available here:
- (http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
+(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
This Product also includes software developed by David Heinemeier Hansson.
-
(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
+(http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
-Portions of the included XmlSchema library are Copyright 2006 International
Business Machines Corp.
+This product also includes MTOSI wsdl and schemas developed by the
+TeleManagement Forum (http://www.tmforum.org/browse.aspx). The original
+MTOSI wsdl and schemas can be download from
+(http://sourceforge.net/projects/mtosi-ri)
+Portions of the included XmlSchema library are Copyright 2006 International
Business Machines Corp.
Portions of the included xml-apis library were originally based on the
following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-
-Portions of the included xbean library were originally based on the following:
+Portions of the included xmlbeans library were originally based on the
following:
- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
Additional copyright notices and license terms applicable are
