tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r600656 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/javax/servlet/resources/j2ee_web_services_1_1.xsd java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
Date Mon, 03 Dec 2007 20:12:36 GMT
Author: jim
Date: Mon Dec  3 12:12:36 2007
New Revision: 600656

URL: http://svn.apache.org/viewvc?rev=600656&view=rev
Log:
Merge r598412 from trunk:

Remove Sun notice that should never have been included in the original commit.
Submitted by: markt
Reviewed by: jim

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd
    tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600656&r1=600655&r2=600656&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec  3 12:12:36 2007
@@ -31,11 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match the dir structure
 
-* Fix another license issue
-  http://svn.apache.org/viewvc?rev=598412&view=rev
-  +1: markt, fhanik, pero, remm, billbarker 
-  -1: 
-
 * Add get/set methods for properties in the Tcp Failure detector
   http://people.apache.org/~fhanik/patches/tcpfaildet-getset.patch
   +1: fhanik, pero, funkman

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd?rev=600656&r1=600655&r2=600656&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd Mon Dec  3
12:12:36 2007
@@ -31,40 +31,6 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:annotation>
-    <xsd:documentation>
-
       (C) Copyright International Business Machines Corporation 2002
 
     </xsd:documentation>

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd?rev=600656&r1=600655&r2=600656&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd Mon
Dec  3 12:12:36 2007
@@ -31,40 +31,6 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:annotation>
-    <xsd:documentation>
-
       (C) Copyright International Business Machines Corporation 2002
 
     </xsd:documentation>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message