Author: markt
Date: Sat Oct 10 11:34:13 2015
New Revision: 1707865
URL: http://svn.apache.org/viewvc?rev=1707865&view=rev
Log:
Servlet 4.0
Update packaging for Java EE 8 schemas
Modified:
tomcat/trunk/LICENSE
tomcat/trunk/NOTICE
tomcat/trunk/res/INSTALLLICENSE
tomcat/trunk/res/META-INF/servlet-api.jar.license
tomcat/trunk/res/META-INF/servlet-api.jar.notice
tomcat/trunk/res/maven/tomcat-servlet-api.pom
tomcat/trunk/res/rat/rat-excludes.txt
Modified: tomcat/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/LICENSE?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/LICENSE (original)
+++ tomcat/trunk/LICENSE Sat Oct 10 11:34:13 2015
@@ -725,6 +725,10 @@ For the following XML Schemas for Java E
- web-app_3_1.xsd
- web-common_3_1.xsd
- web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: tomcat/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Sat Oct 10 11:34:13 2015
@@ -46,6 +46,10 @@ The original XML Schemas for Java EE Dep
- web-app_3_1.xsd
- web-common_3_1.xsd
- web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
may be obtained from:
http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
Modified: tomcat/trunk/res/INSTALLLICENSE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/INSTALLLICENSE?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/res/INSTALLLICENSE (original)
+++ tomcat/trunk/res/INSTALLLICENSE Sat Oct 10 11:34:13 2015
@@ -725,6 +725,10 @@ For the following XML Schemas for Java E
- web-app_3_1.xsd
- web-common_3_1.xsd
- web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: tomcat/trunk/res/META-INF/servlet-api.jar.license
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.license?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/servlet-api.jar.license (original)
+++ tomcat/trunk/res/META-INF/servlet-api.jar.license Sat Oct 10 11:34:13 2015
@@ -228,6 +228,10 @@ For the following XML Schemas for Java E
- web-app_3_1.xsd
- web-common_3_1.xsd
- web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: tomcat/trunk/res/META-INF/servlet-api.jar.notice
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.notice?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/servlet-api.jar.notice (original)
+++ tomcat/trunk/res/META-INF/servlet-api.jar.notice Sat Oct 10 11:34:13 2015
@@ -22,6 +22,10 @@ The original XML Schemas for Java EE Dep
- web-app_3_1.xsd
- web-common_3_1.xsd
- web-fragment_3_1.xsd
+ - javaee_8.xsd
+ - web-app_4_0.xsd
+ - web-common_4_0.xsd
+ - web-fragment_4_0.xsd
may be obtained from:
http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
Modified: tomcat/trunk/res/maven/tomcat-servlet-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-servlet-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Sat Oct 10 11:34:13 2015
@@ -38,6 +38,7 @@
javaee_5.xsd,
javaee_6.xsd,
javaee_7.xsd,
+ javaee_8.xsd,
javaee_web_services_1_2.xsd,
javaee_web_services_client_1_2.xsd,
javaee_web_services_1_3.xsd,
@@ -50,8 +51,11 @@
web-common_3_0.xsd,
web-fragment_3_0.xsd,
web-app_3_1.xsd,
- web-common_3_1.xsd and
- web-fragment_3_1.xsd
+ web-common_3_1.xsd,
+ web-fragment_3_1.xsd,
+ web-app_4_0.xsd,
+ web-common_4_0.xsd and
+ web-fragment_4_0.xsd
to which the CDDL version 1.0 applies.
</comments>
</license>
Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1707865&r1=1707864&r2=1707865&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Sat Oct 10 11:34:13 2015
@@ -118,6 +118,7 @@ res/confinstall/tomcat-users_2.xml
java/javax/servlet/resources/javaee_5.xsd
java/javax/servlet/resources/javaee_6.xsd
java/javax/servlet/resources/javaee_7.xsd
+java/javax/servlet/resources/javaee_8.xsd
java/javax/servlet/resources/javaee_web_services_1_2.xsd
java/javax/servlet/resources/javaee_web_services_1_3.xsd
java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -128,13 +129,17 @@ java/javax/servlet/resources/jsp_2_2.xsd
java/javax/servlet/resources/jsp_2_3.xsd
java/javax/servlet/resources/web-app_3_0.xsd
java/javax/servlet/resources/web-app_3_1.xsd
+java/javax/servlet/resources/web-app_4_0.xsd
java/javax/servlet/resources/web-common_3_0.xsd
java/javax/servlet/resources/web-common_3_1.xsd
+java/javax/servlet/resources/web-common_4_0.xsd
java/javax/servlet/resources/web-fragment_3_0.xsd
java/javax/servlet/resources/web-fragment_3_1.xsd
+java/javax/servlet/resources/web-fragment_4_0.xsd
output/classes/javax/servlet/resources/javaee_5.xsd
output/classes/javax/servlet/resources/javaee_6.xsd
output/classes/javax/servlet/resources/javaee_7.xsd
+output/classes/javax/servlet/resources/javaee_8.xsd
output/classes/javax/servlet/resources/javaee_web_services_1_2.xsd
output/classes/javax/servlet/resources/javaee_web_services_1_3.xsd
output/classes/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -145,13 +150,17 @@ output/classes/javax/servlet/resources/j
output/classes/javax/servlet/resources/jsp_2_3.xsd
output/classes/javax/servlet/resources/web-app_3_0.xsd
output/classes/javax/servlet/resources/web-app_3_1.xsd
+output/classes/javax/servlet/resources/web-app_4_0.xsd
output/classes/javax/servlet/resources/web-common_3_0.xsd
output/classes/javax/servlet/resources/web-common_3_1.xsd
+output/classes/javax/servlet/resources/web-common_4_0.xsd
output/classes/javax/servlet/resources/web-fragment_3_0.xsd
output/classes/javax/servlet/resources/web-fragment_3_1.xsd
+output/classes/javax/servlet/resources/web-fragment_4_0.xsd
output/dist/src/java/javax/servlet/resources/javaee_5.xsd
output/dist/src/java/javax/servlet/resources/javaee_6.xsd
output/dist/src/java/javax/servlet/resources/javaee_7.xsd
+output/dist/src/java/javax/servlet/resources/javaee_8.xsd
output/dist/src/java/javax/servlet/resources/javaee_web_services_1_2.xsd
output/dist/src/java/javax/servlet/resources/javaee_web_services_1_3.xsd
output/dist/src/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -162,10 +171,13 @@ output/dist/src/java/javax/servlet/resou
output/dist/src/java/javax/servlet/resources/jsp_2_3.xsd
output/dist/src/java/javax/servlet/resources/web-app_3_0.xsd
output/dist/src/java/javax/servlet/resources/web-app_3_1.xsd
+output/dist/src/java/javax/servlet/resources/web-app_4_0.xsd
output/dist/src/java/javax/servlet/resources/web-common_3_0.xsd
output/dist/src/java/javax/servlet/resources/web-common_3_1.xsd
+output/dist/src/java/javax/servlet/resources/web-common_4_0.xsd
output/dist/src/java/javax/servlet/resources/web-fragment_3_0.xsd
output/dist/src/java/javax/servlet/resources/web-fragment_3_1.xsd
+output/dist/src/java/javax/servlet/resources/web-fragment_4_0.xsd
output/dist/src/res/checkstyle/header-al2.txt
res/checkstyle/header-al2.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
