From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 Aug 2009 10:07:56 +0000 (+0000)
Subject: Add CDDL election notice to imported Servlet 3.0 XSDs
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=db14c1429358a2d7cbc10f40455bca7f85503594;p=tomcat7.0

Add CDDL election notice to imported Servlet 3.0 XSDs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@805722 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/javax/servlet/resources/javaee_6.xsd b/java/javax/servlet/resources/javaee_6.xsd
index df78cfd06..f4c18c505 100644
--- a/java/javax/servlet/resources/javaee_6.xsd
+++ b/java/javax/servlet/resources/javaee_6.xsd
@@ -59,6 +59,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following definitions that appear in the common
       shareable schema(s) of Java EE deployment descriptors should be
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
index d53e9f4da..48dc31191 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -60,6 +60,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
 
       (C) Copyright International Business Machines Corporation 2002
       
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
index 237d33c7a..eee3602f4 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
@@ -60,6 +60,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
 
       (C) Copyright International Business Machines Corporation 2002
       
diff --git a/java/javax/servlet/resources/web-app_3_0.xsd b/java/javax/servlet/resources/web-app_3_0.xsd
index f1855ed8a..d2cdfbe3d 100644
--- a/java/javax/servlet/resources/web-app_3_0.xsd
+++ b/java/javax/servlet/resources/web-app_3_0.xsd
@@ -60,6 +60,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
 <![CDATA[[
       This is the XML Schema for the Servlet 3.0 deployment descriptor.
       The deployment descriptor must be named "WEB-INF/web.xml" in the
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd b/java/javax/servlet/resources/web-common_3_0.xsd
index 32c982b90..8015d73b0 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -60,6 +60,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
 <![CDATA[[
       This is the common XML Schema for the Servlet 3.0 deployment descriptor.
       This file is in turn used by web.xml and web-fragment.xml
diff --git a/java/javax/servlet/resources/web-fragment_3_0.xsd b/java/javax/servlet/resources/web-fragment_3_0.xsd
index cfdd307e5..0705689ef 100644
--- a/java/javax/servlet/resources/web-fragment_3_0.xsd
+++ b/java/javax/servlet/resources/web-fragment_3_0.xsd
@@ -58,6 +58,13 @@
 
   <xsd:annotation>
     <xsd:documentation>
+      The Apache Software Foundation elects to include this software under the
+      CDDL license.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
       <![CDATA[
 
 	This is the XML Schema for the Servlet 3.0 deployment descriptor.