Author: markt
Date: Sun Dec  9 09:28:35 2007
New Revision: 602699

URL: http://svn.apache.org/viewvc?rev=602699&view=rev
Log:
This file was originally committed (in TC5.5.x) by a Sun employee (Remy) with 
Sun's permission and is therefore licensed to the ASF under a CLA. As such, the 
restrictive header can be removed. See the following legal-discuss thread that 
went into this in much more detail:
URL: 
http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200707.mbox/browser
Thread: SUN PROPRIETARY/CONFIDENTIAL code in myfaces

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=602699&r1=602698&r2=602699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec  9 09:28:35 2007
@@ -31,9 +31,4 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Port license fix from TC5 that got missed last time - sorry
-  http://svn.apache.org/viewvc?rev=600993&view=rev
-  +1: markt, fhanik, funkman, remm, pero
-  -1: 
-
 

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd?rev=602699&r1=602698&r2=602699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd Sun Dec  9 
09:28:35 2007
@@ -28,40 +28,6 @@
     </xsd:documentation>
   </xsd:annotation>
 
-  <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>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to