[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151010-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151010/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151010.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151010-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true - Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151010/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/g
svn commit: r1707840 - /tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
Author: markt
Date: Sat Oct 10 08:10:50 2015
New Revision: 1707840
URL: http://svn.apache.org/viewvc?rev=1707840&view=rev
Log:
Fix test broken by updates to Servlet 4.0
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1707840&r1=1707839&r2=1707840&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java Sat
Oct 10 08:10:50 2015
@@ -44,8 +44,8 @@ public class TestWebXml {
WebXml webxml = new WebXml();
// Defaults
-Assert.assertEquals(3, webxml.getMajorVersion());
-Assert.assertEquals(1, webxml.getMinorVersion());
+Assert.assertEquals(4, webxml.getMajorVersion());
+Assert.assertEquals(0, webxml.getMinorVersion());
// Both get changed
webxml.setVersion("2.5");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707841 - /tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Author: markt
Date: Sat Oct 10 08:13:08 2015
New Revision: 1707841
URL: http://svn.apache.org/viewvc?rev=1707841&view=rev
Log:
Fix test broken by updates to Servlet 4.0
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java?rev=1707841&r1=1707840&r2=1707841&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java Sat
Oct 10 08:13:08 2015
@@ -113,12 +113,15 @@ public class TestJspCServletContext {
Assert.assertEquals(1, context.getEffectiveMinorVersion());
}
+// TODO Servlet 4.0
+// Once a 4.0 web.xml is available
+
@Test
public void testWebresources() throws Exception {
File appDir = new File("test/webresources/dir1");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(3, context.getEffectiveMajorVersion());
-Assert.assertEquals(1, context.getEffectiveMinorVersion());
+Assert.assertEquals(4, context.getEffectiveMajorVersion());
+Assert.assertEquals(0, context.getEffectiveMinorVersion());
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707842 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Author: markt
Date: Sat Oct 10 08:32:39 2015
New Revision: 1707842
URL: http://svn.apache.org/viewvc?rev=1707842&view=rev
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java?rev=1707842&r1=1707841&r2=1707842&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java Sat
Oct 10 08:32:39 2015
@@ -73,6 +73,11 @@ public final class XmlIdentifiers {
public static final String WEB_FRAGMENT_31_XSD = JAVAEE_7_NS +
"/web-fragment_3_1.xsd";
public static final String WEBSERVICES_14_XSD = JAVAEE_7_NS +
"/javaee_web_services_1_4.xsd";
+// from JavaEE 8
+public static final String JAVAEE_8_NS = JAVAEE_7_NS;
+public static final String WEB_40_XSD = JAVAEE_8_NS + "/web-app_4_0.xsd";
+public static final String WEB_FRAGMENT_40_XSD = JAVAEE_8_NS +
"/web-fragment_4_0.xsd";
+
private XmlIdentifiers() {
}
}
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707849 [1/3] - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Author: markt Date: Sat Oct 10 09:03:00 2015 New Revision: 1707849 URL: http://svn.apache.org/viewvc?rev=1707849&view=rev Log: First draft of XSDs for JavaEE 8 from Glassfish. These are exact copies of the files in the Glassfish repo. Subsequent commits will add the necessary license election, fix formatting, etc. Added: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (with props) tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (with props) tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd (with props) tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd (with props) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707849 [3/3] - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Propchange: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd -- svn:eol-style = native Added: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1707849&view=auto == --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (added) +++ tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd Sat Oct 10 09:03:00 2015 @@ -0,0 +1,340 @@ + + +http://www.w3.org/2001/XMLSchema"; + targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="4.0"> + + + + http://www.w3.org/2001/XInclude"; href="license.inc" parse="text"/> + + + + + + + + + + + + http://www.w3.org/2001/XInclude"; href="common.inc" parse="text"/> + + + + + + + + + + + + + + The web-app element is the root of the deployment + descriptor for a web application. Note that the sub-elements + of this element can be in the arbitrary order. Because of + that, the multiplicity of the elements of distributable, + session-config, welcome-file-list, jsp-config, login-config, + and locale-encoding-mapping-list was changed from "?" to "*" + in this schema. However, the deployment descriptor instance + file must not contain multiple elements of session-config, + jsp-config, and login-config. When there are multiple elements of + welcome-file-list or locale-encoding-mapping-list, the container + must concatenate the element contents. The multiple occurence + of the element distributable is redundant and the container + treats that case exactly in the same way when there is only + one distributable. + + + + + + + + + The servlet element contains the name of a servlet. + The name must be unique within the web application. + + + + + + + + + + + + The filter element contains the name of a filter. + The name must be unique within the web application. + + + + + + + + + + + + The ejb-local-ref-name element contains the name of an EJB + reference. The EJB reference is an entry in the web + application's environment and is relative to the + java:comp/env context. The name must be unique within + the web application. + + It is recommended that name is prefixed with "ejb/". + + + + + + + + + + + + The ejb-ref-name element contains the name of an EJB + reference. The EJB reference is an entry in the web + application's environment and is relative to the + java:comp/env context. The name must be unique within + the web application. + + It is recommended that name is prefixed with "ejb/". + + + + + + + + + + + + The resource-env-ref-name element specifies the name of + a resource environment reference; its value is the + environment entry name used in the web application code. + The name is a JNDI name relative to the java:comp/env + context and must be unique within a web application. + + + + + + + + + + + + The message-destination-ref-name element specifies the name of + a message destination reference; its value is the + environment entry name used in the web application code. + The name is a JNDI name relative to the java:comp/env + context and must be unique within a web application. + + + + + + + + + + + + + The res-ref-name element specifies the name of a + resource manager connection factory reference. The name + is a JNDI name relative to the java:comp/env context. + The name must be unique within a web application. + + + + + + + + + + + + The env-entry-name element contains the name of a web + application's environment entry. The name is a JNDI + name relative to the java:comp/env context. The name + must be unique within a web application. + + + + + + + + + + + + + A role-name-key is specified to allow the references + from the security-role-refs. + + + + + + + + + + + + The keyref in
svn commit: r1707849 [2/3] - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Added: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd?rev=1707849&view=auto == --- tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (added) +++ tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd Sat Oct 10 09:03:00 2015 @@ -0,0 +1,3076 @@ + + +http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="8"> + + + + http://www.w3.org/2001/XInclude"; href="license.inc" parse="text"/> + + + + + + http://www.w3.org/2001/XInclude"; href="glossary.inc" parse="text"/> + + + + + http://www.w3.org/XML/1998/namespace"; + schemaLocation="http://www.w3.org/2001/xml.xsd"/> + + + + + + + + + +This group keeps the usage of the contained description related +elements consistent across Java EE deployment descriptors. + +All elements may occur multiple times with different languages, +to support localization of the content. + + + + + + + + + + + + + + + + +This group keeps the usage of the contained JNDI environment +reference elements consistent across Java EE deployment descriptors. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +This group collects elements that are common to most +JNDI resource elements. + + + + + + + + + + + + The JNDI name to be looked up to resolve a resource reference. + + + + + + + + + + + + + + +This group collects elements that are common to all the +JNDI resource elements. It does not include the lookup-name +element, that is only applicable to some resource elements. + + + + + + + + + + + + + + + + + + + + + + + +Configuration of an administered object. + + + + + + + + +Description of this administered object. + + + + + + + + +The name element specifies the JNDI name of the +administered object being defined. + + + + + + + + + The administered object's interface type. + + + + + + + + + The administered object's class name. + + + + + + + + +Resource adapter name. + + + + + + + + +Property of the administered object property. This may be a +vendor-specific property. + + + + + + + + + + + + + + +Configuration of a Connector Connection Factory resource. + + + + + + + + +Description of this resource. + + + + + + + + +The name element specifies the JNDI name of the +resource being defined. + + + + + + + + +The fully qualified class name of the connection factory +interface. + + + + + + + + + +Resource adapter name. + + + + + + + + +Maximum number of connections that should be concurrently +allocated for a connection pool. + + + + + + + + +Minimum number of connections that should be concurrently +allocated for a connection pool. + + + + + + + + +The level of transaction support the connection factory +needs to support. + + + + + + + + +Resource property. This may be a vendor-specific +property. + + + + + + + + + + + + + + +Configuration of a DataSource. + + + + + + + + +Description of this DataSource. + + + + + + + + +The name element specifies the JNDI name of the +data source being defined. + + + + + + +
svn commit: r1707851 - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Author: markt Date: Sat Oct 10 09:04:27 2015 New Revision: 1707851 URL: http://svn.apache.org/viewvc?rev=1707851&view=rev Log: License election (CDDL only) Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd?rev=1707851&r1=1707850&r2=1707851&view=diff == --- tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd Sat Oct 10 09:04:27 2015 @@ -39,6 +39,9 @@ only if the new code is made subject to such option by the copyright holder. +The Apache Software Foundation elects to include this software under the +CDDL license. + --> http://xmlns.jcp.org/xml/ns/javaee"; Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1707851&r1=1707850&r2=1707851&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd Sat Oct 10 09:04:27 2015 @@ -39,6 +39,9 @@ only if the new code is made subject to such option by the copyright holder. +The Apache Software Foundation elects to include this software under the +CDDL license. + --> http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; Modified: tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd?rev=1707851&r1=1707850&r2=1707851&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd Sat Oct 10 09:04:27 2015 @@ -39,6 +39,9 @@ only if the new code is made subject to such option by the copyright holder. +The Apache Software Foundation elects to include this software under the +CDDL license. + --> http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; Modified: tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd?rev=1707851&r1=1707850&r2=1707851&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Sat Oct 10 09:04:27 2015 @@ -39,6 +39,9 @@ only if the new code is made subject to such option by the copyright holder. +The Apache Software Foundation elects to include this software under the +CDDL license. + --> http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707852 - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Author: markt Date: Sat Oct 10 09:06:23 2015 New Revision: 1707852 URL: http://svn.apache.org/viewvc?rev=1707852&view=rev Log: Tab police. Tabs -> 8 spaces. Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd?rev=1707852&r1=1707851&r2=1707852&view=diff == --- tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd Sat Oct 10 09:06:23 2015 @@ -277,7 +277,7 @@ + minOccurs="0"> @@ -332,7 +332,7 @@ Configuration of a Connector Connection Factory resource. - + + type="javaee:transaction-supportType" + minOccurs="0"> @@ -1083,8 +1083,8 @@ java.lang.Long java.lang.Float java.lang.Double - java.lang.Class - any enumeration type (i.e. a subclass of java.lang.Enum) + java.lang.Class + any enumeration type (i.e. a subclass of java.lang.Enum) Examples: @@ -1254,8 +1254,8 @@ - The following transaction isolation levels are allowed - (see documentation for the java.sql.Connection interface): +The following transaction isolation levels are allowed +(see documentation for the java.sql.Connection interface): TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED TRANSACTION_REPEATABLE_READ @@ -3055,23 +3055,23 @@ - The transaction-supportType specifies the level of - transaction support provided by the resource adapter. It is - used by transaction-support elements. - - The value must be one of the following: - - NoTransaction - LocalTransaction - XATransaction +The transaction-supportType specifies the level of +transaction support provided by the resource adapter. It is +used by transaction-support elements. + +The value must be one of the following: + +NoTransaction +LocalTransaction +XATransaction - - - + + + Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1707852&r1=1707851&r2=1707852&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd Sat Oct 10 09:06:23 2015 @@ -44,12 +44,12 @@ --> http://www.w3.org/2001/XMLSchema"; - targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; - xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="4.0"> +targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; +xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema"; +elementFormDefault="qualified" +attributeFormDefault="unqualified" +version="4.0"> @@ -61,31 +61,31 @@ +]]> @@ -105,32 +105,32 @@ - The web-app element is the root of the deployment - descriptor for a web application. Note that the sub-elements - of this element can be in the arbitrary order. Because of - that, the multiplicity of the elements of distributable, - session-config, welcome-file-list, jsp-config, login-config, - and locale-encoding-mapping-list was changed from "?" to "*" - in this schema. However, the deployment descriptor instance - file must not contain multiple elements of session-config, - jsp-config, and login-config. When there are multiple elements of - welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurence - of the element distributable is redundant and the container - treats that case exactly in the same way when there is only - one distributable. +
svn commit: r1707853 - in /tomcat/trunk/java/javax/servlet/resources: javaee_8.xsd web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Author: markt Date: Sat Oct 10 09:11:41 2015 New Revision: 1707853 URL: http://svn.apache.org/viewvc?rev=1707853&view=rev Log: Remove trailing whitespace Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd?rev=1707853&r1=1707852&r2=1707853&view=diff == --- tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd Sat Oct 10 09:11:41 2015 @@ -145,21 +145,21 @@ - - - + + - - @@ -313,7 +313,7 @@ -Property of the administered object property. This may be a +Property of the administered object property. This may be a vendor-specific property. @@ -332,7 +332,7 @@ Configuration of a Connector Connection Factory resource. - + -The fully qualified class name of the connection factory -interface. +The fully qualified class name of the connection factory +interface. @@ -409,8 +409,8 @@ -The level of transaction support the connection factory -needs to support. +The level of transaction support the connection factory +needs to support. @@ -466,7 +466,7 @@ - + @@ -524,7 +524,7 @@ such as serverName, databaseName and portNumber, the more specific properties will take precedence and url will be ignored. - + ]]> @@ -660,7 +660,7 @@ - + @@ -682,7 +682,7 @@ contains the description. The lang attribute defines the language that the -description is provided in. The default value is "en" (English). +description is provided in. The default value is "en" (English). @@ -700,7 +700,7 @@ This type defines a dewey decimal that is used -to describe versions of documents. +to describe versions of documents. @@ -721,14 +721,14 @@ to be displayed by tools. It is used by display-name elements. The display name need not be unique. - Example: + Example: ... Employee Self Service - The value of the xml:lang attribute is "en" (English) by default. + The value of the xml:lang attribute is "en" (English) by default. ]]> @@ -753,7 +753,7 @@ The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file or in another ejb-jar - file in the same Java EE application unit. + file in the same Java EE application unit. Alternatively, the name in the ejb-link element may be composed of a path name specifying the ejb-jar containing the @@ -790,18 +790,18 @@ The declaration consists of: - an optional description -- the EJB reference name used in the code of the Deployment +- the EJB reference name used in the code of the Deployment Component that's referencing the enterprise bean. - the optional expected type of the referenced enterprise bean -- the optional expected local interface of the referenced - enterprise bean or the local business interface of the +- the optional expected local interface of the referenced + enterprise bean or the local business interface of the referenced enterprise bean. -- the optional expected local home interface of the referenced +- the optional expected local home interface of the referenced enterprise bean. Not applicable if this ejb-local-ref refers to the local business interface of a 3.0 bean. -- optional ejb-link information, used to specify the +- optional ejb-link information, used to specify the referenced enterprise bean -- optional elements to define injection of the named enterprise +- optional elements to define injection of the named enterprise bean into a component field or property. @@ -866,18 +866,18 @@ The ejb-r
svn commit: r1707863 - /tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
Author: markt
Date: Sat Oct 10 11:32:14 2015
New Revision: 1707863
URL: http://svn.apache.org/viewvc?rev=1707863&view=rev
Log:
Fix test after GenericFilter changes
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java?rev=1707863&r1=1707862&r2=1707863&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java Sat Oct
10 11:32:14 2015
@@ -17,11 +17,14 @@
package org.apache.catalina.filters;
import java.io.IOException;
+import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -704,7 +707,24 @@ public class TestCorsFilter {
TesterHttpServletResponse response = new TesterHttpServletResponse();
CorsFilter corsFilter = new CorsFilter();
-corsFilter.init(null);
+corsFilter.init(new FilterConfig() {
+@Override
+public ServletContext getServletContext() {
+return null;
+}
+@Override
+public Enumeration getInitParameterNames() {
+return null;
+}
+@Override
+public String getInitParameter(String name) {
+return null;
+}
+@Override
+public String getFilterName() {
+return null;
+}
+});
corsFilter.doFilter(request, response, filterChain);
Assert.assertTrue(response.getHeader(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707864 - in /tomcat/trunk/java/org/apache/tomcat/util/descriptor: DigesterFactory.java LocalResolver.java web/WebXml.java
Author: markt
Date: Sat Oct 10 11:33:30 2015
New Revision: 1707864
URL: http://svn.apache.org/viewvc?rev=1707864&view=rev
Log:
Servlet 4.0
Add support for 4.0 web.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Sat Oct 10 11:33:30 2015
@@ -120,6 +120,12 @@ public class DigesterFactory {
addSelf(systemIds, "javaee_web_services_1_4.xsd");
addSelf(systemIds, "javaee_web_services_client_1_4.xsd");
+// from JavaEE 8
+add(systemIds, XmlIdentifiers.WEB_40_XSD,
locationFor("web-app_4_0.xsd"));
+add(systemIds, XmlIdentifiers.WEB_FRAGMENT_40_XSD,
locationFor("web-fragment_4_0.xsd"));
+addSelf(systemIds, "web-common_4_0.xsd");
+addSelf(systemIds, "javaee_8.xsd");
+
SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java Sat
Oct 10 11:33:30 2015
@@ -40,7 +40,7 @@ public class LocalResolver implements En
private static final String[] JAVA_EE_NAMESPACES = {
XmlIdentifiers.JAVAEE_1_4_NS,
XmlIdentifiers.JAVAEE_5_NS,
-XmlIdentifiers.JAVAEE_7_NS };
+XmlIdentifiers.JAVAEE_7_NS};
private final Map publicIds;
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Sat Oct
10 11:33:30 2015
@@ -681,8 +681,8 @@ public class WebXml {
javaeeNamespace = XmlIdentifiers.JAVAEE_7_NS;
webXmlSchemaLocation = XmlIdentifiers.WEB_31_XSD;
} else if ("4.0".equals(version)) {
-// TODO Servlet 4.0
-throw new UnsupportedOperationException();
+javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
+webXmlSchemaLocation = XmlIdentifiers.WEB_40_XSD;
}
sb.append("
svn commit: r1707865 - in /tomcat/trunk: LICENSE NOTICE res/INSTALLLICENSE res/META-INF/servlet-api.jar.license res/META-INF/servlet-api.jar.notice res/maven/tomcat-servlet-api.pom res/rat/rat-exclude
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. 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 (origin
svn commit: r1707866 - in /tomcat/trunk/test: javax/servlet/resources/TestSchemaValidation.java org/apache/jasper/servlet/TestJspCServletContext.java org/apache/tomcat/util/descriptor/web/TestWebXml.j
Author: markt
Date: Sat Oct 10 11:34:48 2015
New Revision: 1707866
URL: http://svn.apache.org/viewvc?rev=1707866&view=rev
Log:
Servlet 4.0
Update tests for 4.0 schemas
Added:
tomcat/trunk/test/webapp-4.0/
- copied from r1707839, tomcat/trunk/test/webapp-3.1/
Modified:
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
tomcat/trunk/test/webapp-4.0/WEB-INF/web.xml
Modified: tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1707866&r1=1707865&r2=1707866&view=diff
==
--- tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
(original)
+++ tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java Sat Oct
10 11:34:48 2015
@@ -130,5 +130,17 @@ public class TestSchemaValidation {
Assert.assertEquals(0, handler.getWarnings().size());
}
-// TODO Servlet 4.0
+@Test
+public void testWebapp_4_0() throws Exception {
+XmlErrorHandler handler = new XmlErrorHandler();
+Digester digester = DigesterFactory.newDigester(
+true, true, new WebRuleSet(false), true);
+digester.setErrorHandler(handler);
+digester.push(new WebXml());
+WebXml desc = (WebXml) digester.parse(
+new File("test/webapp-4.0/WEB-INF/web.xml"));
+Assert.assertEquals("4.0", desc.getVersion());
+Assert.assertEquals(0, handler.getErrors().size());
+Assert.assertEquals(0, handler.getWarnings().size());
+}
}
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java?rev=1707866&r1=1707865&r2=1707866&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java Sat
Oct 10 11:34:48 2015
@@ -113,8 +113,15 @@ public class TestJspCServletContext {
Assert.assertEquals(1, context.getEffectiveMinorVersion());
}
-// TODO Servlet 4.0
-// Once a 4.0 web.xml is available
+@Test
+public void testWebapp_4_0() throws Exception {
+File appDir = new File("test/webapp-4.0");
+JspCServletContext context = new JspCServletContext(
+null, appDir.toURI().toURL(), null, false, false);
+Assert.assertEquals(4, context.getEffectiveMajorVersion());
+Assert.assertEquals(0, context.getEffectiveMinorVersion());
+}
+
@Test
public void testWebresources() throws Exception {
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1707866&r1=1707865&r2=1707866&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java Sat
Oct 10 11:34:48 2015
@@ -170,7 +170,10 @@ public class TestWebXml {
doTestValidateVersion("3.1");
}
-// TODO Servlet 4.0
+@Test
+public void testValidateVersion40() throws IOException, SAXException {
+doTestValidateVersion("4.0");
+}
private void doTestValidateVersion(String version) throws IOException,
SAXException {
WebXml webxml = new WebXml();
Modified: tomcat/trunk/test/webapp-4.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-4.0/WEB-INF/web.xml?rev=1707866&r1=1707839&r2=1707866&view=diff
==
--- tomcat/trunk/test/webapp-4.0/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-4.0/WEB-INF/web.xml Sat Oct 10 11:34:48 2015
@@ -18,16 +18,16 @@
http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
+ version="4.0"
metadata-complete="true">
- Tomcat Servlet 3.1 Tests
+ Tomcat Servlet 4.0 Tests
Provides a web application used by the Tomcat unit tests to ensure that
Tomcat meets the requirements of the current JSP and Servlet specification
-for web applications that declare that they follow version 3.1 of the
-Servlet specification and version 2.3 of the
svn commit: r1707868 - in /tomcat/trunk: conf/ res/META-INF/jasper.jar/ res/META-INF/tomcat-websocket.jar/ test/javax/servlet/resources/ test/org/apache/catalina/startup/ test/org/apache/jasper/ test/
Author: markt
Date: Sat Oct 10 11:49:22 2015
New Revision: 1707868
URL: http://svn.apache.org/viewvc?rev=1707868&view=rev
Log:
Servlet 4.0
Update web applications that should be using the current web.xml schema to 4.0
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
tomcat/trunk/test/org/apache/jasper/TestJspC.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/trunk/test/webapp/WEB-INF/web.xml
tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/trunk/webapps/docs/WEB-INF/web.xml
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/appdev/introduction.xml
tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
- version="3.1">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
+ version="4.0">
Modified: tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==
--- tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml Sat Oct 10 11:49:22
2015
@@ -18,8 +18,8 @@
http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd";
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd";
+ version="4.0"
metadata-complete="true">
org_apache_jasper
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Sat Oct 10
11:49:22 2015
@@ -18,8 +18,8 @@
http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd";
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd";
+ version="4.0"
metadata-complete="true">
org_apache_tomcat_websocket
Modified: tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1707868&r1=1707867&r2=1707868&view=diff
==
--- tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
(original)
+++ tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java Sat Oct
10 11:49:22 2015
@@ -39,7 +39,7 @@ public class TestSchemaValidation {
digester.push(new WebXml());
WebXml desc = (WebXml) digester.parse(
new File("test/webapp/WEB-INF/web.xml"));
-Assert.assertEquals("3.1", desc.getVersion());
+Assert.assertEquals("4.0", desc.getVersion())
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/427 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707866 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707869 - in /tomcat/trunk/java/javax/servlet/resources: web-app_4_0.xsd web-common_4_0.xsd web-fragment_4_0.xsd
Author: markt Date: Sat Oct 10 11:49:47 2015 New Revision: 1707869 URL: http://svn.apache.org/viewvc?rev=1707869&view=rev Log: Fix some copy/paste errors in the schemas Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1707869&r1=1707868&r2=1707869&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd Sat Oct 10 11:49:47 2015 @@ -61,7 +61,7 @@
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/428 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707869 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707872 - /tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Author: markt
Date: Sat Oct 10 12:05:43 2015
New Revision: 1707872
URL: http://svn.apache.org/viewvc?rev=1707872&view=rev
Log:
Servlet 4.0
Default is now 4.0 not 3.1
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java?rev=1707872&r1=1707871&r2=1707872&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java Sat
Oct 10 12:05:43 2015
@@ -33,8 +33,8 @@ public class TestJspCServletContext {
File appDir = new File("test/webapp");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(3, context.getEffectiveMajorVersion());
-Assert.assertEquals(1, context.getEffectiveMinorVersion());
+Assert.assertEquals(4, context.getEffectiveMajorVersion());
+Assert.assertEquals(0, context.getEffectiveMinorVersion());
JspConfigDescriptor jspConfigDescriptor =
context.getJspConfigDescriptor();
Assert.assertTrue(jspConfigDescriptor.getTaglibs().isEmpty());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.65
Am 09.10.2015 um 13:04 schrieb Violeta Georgieva: The proposed Apache Tomcat 7.0.65 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.65/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1053/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_65/ The proposed 7.0.65 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 7.0.65 Stable (non-binding) md5, sha1 and pgp keys seem to be valid. Tests are OK on ubuntu 14.04.3 64 bit with openjdk java version "1.7.0_79". Regards, Felix Regards, Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1707892 - /tomcat/trunk/java/javax/servlet/ServletContext.java
Author: markt
Date: Sat Oct 10 16:08:51 2015
New Revision: 1707892
URL: http://svn.apache.org/viewvc?rev=1707892&view=rev
Log:
Trivial Javadoc commit to trigger CI
Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707892&r1=1707891&r2=1707892&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Sat Oct 10 16:08:51 2015
@@ -61,6 +61,8 @@ public interface ServletContext {
/**
* Return the main path associated with this context.
*
+ * @return The main context path
+ *
* @since Servlet 2.5
*/
public String getContextPath();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/430 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1707892 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.28
Am 07.10.2015 um 21:13 schrieb Mark Thomas: The proposed Apache Tomcat 8.0.28 release is now available for voting. The main changes since 8.0.27 are: - Allow file based configuration resources (e.g. key stores) to be configured using URLs - Restore code signing to the Windows installer an uninstaller There is a smaller that usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.28/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1052/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_28/ The proposed 8.0.28 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 8.0.28 +1 to release. Details === - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src completely consistent with svn tag - builds fine - warning about unchecked calls or conversions in: - org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java - org/apache/tomcat/jdbc/pool/PoolProperties.java Not a regression - build result looks consistent with binaries - no checkstyle complaints - no Javadoc warnings - Unit tests: No failures - Two minor observations see below - JMX MBean Comparison: - ThreadPool MBean attribute keepAliveCount now is 0, previously was 1. Not sure why this happened. Build and tests were done using Java 1.7.0_80. OS was Solaris 10 Sparc, tcnative was 1.1.33 based on APR 1.5.1 and OpenSSL 1.0.2d. Two thing in unit test output were not present in 8.0.27 output and look a bit fishy: - java.net.SocketTimeoutException [junit] Running org.apache.catalina.comet.TestCometProcessor ... [junit] 10-Oct-2015 18:41:36.438 INFO [main] org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case [testCometConnectorStop] [junit] 10-Oct-2015 18:41:36.444 INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded APR based Apache Tomcat Native library 1.1.33 using APR version 1.5.2. [junit] 10-Oct-2015 18:41:36.444 INFO [main] org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. [junit] 10-Oct-2015 18:41:37.019 INFO [main] org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL successfully initialized (OpenSSL 1.0.2d 9 Jul 2015) [junit] 10-Oct-2015 18:41:37.024 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["http-apr-127.0.0.1-auto-2"] [junit] 10-Oct-2015 18:41:37.027 INFO [main] org.apache.catalina.core.StandardService.startInternal Starting service Tomcat [junit] 10-Oct-2015 18:41:37.028 INFO [main] org.apache.catalina.core.StandardEngine.startInternal Starting Servlet Engine: Apache Tomcat/8.0.28 [junit] 10-Oct-2015 18:41:37.072 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-apr-127.0.0.1-auto-2-53579"] [junit] 10-Oct-2015 18:41:40.081 INFO [main] org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler ["http-apr-127.0.0.1-auto-2-53579"] [junit] 10-Oct-2015 18:41:50.218 INFO [main] org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler ["http-apr-127.0.0.1-auto-2-53579"] [junit] 10-Oct-2015 18:41:50.221 SEVERE [main] org.apache.catalina.comet.TestCometProcessor.testCometConnectorStop Status: [junit] WriterThread exception: null [junit] ReaderThread exception: java.net.SocketTimeoutException: Read timed out [junit] Last message: [Client: END] [junit] Last response line: [0] [junit] Last comet event: [END] [junit] END event occurred: [true] [junit] 10-Oct-2015 18:41:50.222 INFO [main] org.apache.catalina.core.StandardService.stopInternal Stopping service Tomcat - java.lang.NullPointerException [junit] Running org.apache.catalina.connector.TestCoyoteOutputStream [junit] 10-Oct-2015 17:55:01.172 INFO [main] org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case [testNonBlockingWriteNoneBlockingWriteNoneNonContainerThread] [junit] 10-Oct-2015 17:55:06.052 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["http-nio2-127.0.0.1-auto-1"] [junit] 10-Oct-2015 17:55:06.153 INFO [main] org.apache.catalina.core.StandardService.startInternal Starting service Tomcat [junit] 10-Oct-2015 17:55:06.155 INFO [main] org.apache.catalina.core.StandardEngine.startInternal Starting Servlet Engine: Apache Tomcat/8.0.28 [junit] 10-Oct-2015 17:55:07.182 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio2-127.0.0.1-auto-1-50683"] [junit] 10-Oct-2015 17:55:09.155 INFO [main] org.apache.coyote.AbstractProtocol.pause Pausin
