[tomcat] branch master updated: Use the correct file to grep for failures in travis
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 22b4f77 Use the correct file to grep for failures in travis
22b4f77 is described below
commit 22b4f7752aa33d34a206417854c9c04f408eac11
Author: Felix Schumacher
AuthorDate: Fri Jun 19 06:56:40 2020 +0200
Use the correct file to grep for failures in travis
---
.travis/antTest.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis/antTest.sh b/.travis/antTest.sh
index cc40bad..0e266e6 100755
--- a/.travis/antTest.sh
+++ b/.travis/antTest.sh
@@ -23,7 +23,7 @@
ant -q test 2>&1 > ant-test.log
RC=$?
{
-if grep -q "Testsuites with failed tests:"; then
+if grep -q "Testsuites with failed tests:" ant-test.log; then
for failed in $(awk 'failed == 1 { print $2 }; /Testsuites with failed
tests:/ { failed=1 }' ant-test.log); do
echo "Failed test: $failed"
cat output/build/logs/$failed
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[CONF] Apache Tomcat > Servlet TCK 5.0
Title: Message Title
There's 1 new edit on this page
Servlet TCK 5.0
Mark Thomas edited this page
Here's what changed:
... securedWebServicePort=8443
command.testExecute += -Djavax.net.ssl.trustStore=${ts.home}/bin/certificates/cacerts.jks
command.textExecute -= -Djava.endorsed.dirs=${endorsedlib.dir} (Java 11 only)
set JAVA_HOME cd $SERVLET_TCK_HOME/bin ...
Go to page history
View page
Stop watching space
•
Manage notifications
This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 5.0
Title: Message Title
There's 2 new edits on this page
Servlet TCK 5.0
Mark Thomas edited this page
Here's what changed:
Running Tomcat This is a work in progress while I figure out which settings required for the Servlet 4.0 TCK ar still required for the Servlet 5.0 TCK. setenv.[sh|bat] Set the following system properties
-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
context.xml Make the following changes: ... ... server.xml Enable h2c on port 8080, and add some trailer headers ... tomcat-users.xml Make the following changes: web.xml Remove the sections setting the default character encoding for requests and responses to UTF-8. ... . ... server.xml Enable TLS on port 8443 certificateKeystorePassword="changeit" type="RSA" /> Remove the lock-out realm Client certificate tests: see below Test Suite Download latest nightly build ... Extract to SERVLET_TCK_HOMEImportcd $SERVLET_TCK_HOME/bin/certificates Convert cts_cert to a truststore doing: "keytool -import -alias cts -file cts_cert -storetype JKS -keystore cacerts.jks" password should be "changeit" Create the truststore using "keytool -import -alias cts -file cts_cert -storetype JKS -keystore cacerts.jks" password should be "changeit" Place cacerts.jks truststore in $SERVLET_TCK_HOME/bin/certificates Add $SERVLET_TCK_HOME/bin/certificates/cacerts.jks and $SERVLET_TCK_HOME/bin/certificates/clientcert.jks in the Tomcat conf folder ... securedWebServicePort=8443 command.testExecute += -Djava.endorsed.dirs=${ts.home}/endorsedlib -Djavax.net.ssl.trustStore=${ts.home}/bin/certificates/cacerts.jks ... Accept the defaults and then run the tests Expected results A default 10.0.x build (as of 2020-06-18) with the above configuration and the TCK built from source (as of 2020-06-18) triggers 25 23 test failures 1 Expected failures ...
PR 338
Incorrect major version (1 failure),
Using LF rather an CRLF (15 failures)
Strange /j_security_check test (2 failures)
Error page attributes assumed to be unset when spec requires them to be set (3 failures)
Missing annotation marker in Java 8 signature tests (1 failure)
...
Re-do Java 11 signature test based on Java 8
Go to page history
View page
Stop watching space
•
Manage notifications
This message was sent by Atlassian Confluence 7.5.0
[tomcat] branch master updated: Try to print out more information forx failed tests in travis
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 14053be Try to print out more information forx failed tests in travis
14053be is described below
commit 14053be4e6863afffbbc7b01d5098565034f289e
Author: Felix Schumacher
AuthorDate: Thu Jun 18 19:42:55 2020 +0200
Try to print out more information forx failed tests in travis
---
.travis.yml| 1 +
.travis/antTest.sh | 11 +++
2 files changed, 12 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 2ae1a0d..3d9cecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,7 @@ script:
after_failure:
- tail -n 5000 ant-test.log
+- tail -n 5000 test-failures.log
- ls -laR $HOME/tomcat-build-libs
notifications:
diff --git a/.travis/antTest.sh b/.travis/antTest.sh
index 22ce104..cc40bad 100755
--- a/.travis/antTest.sh
+++ b/.travis/antTest.sh
@@ -21,3 +21,14 @@
# much logging on stdout
ant -q test 2>&1 > ant-test.log
+RC=$?
+{
+if grep -q "Testsuites with failed tests:"; then
+for failed in $(awk 'failed == 1 { print $2 }; /Testsuites with failed
tests:/ { failed=1 }' ant-test.log); do
+echo "Failed test: $failed"
+cat output/build/logs/$failed
+echo
+done
+fi
+} > test-failures.log
+exit $RC
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Use current versions of OpenJDK for travis builds
This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 81beb93 Use current versions of OpenJDK for travis builds 81beb93 is described below commit 81beb93a6bbb0ec9e72ce761950bd513b8626532 Author: Felix Schumacher AuthorDate: Thu Jun 18 19:24:17 2020 +0200 Use current versions of OpenJDK for travis builds Second try, as the first commit of this (d53dbca6db1c1456c0e1fa544dc360dc230141f6) seems to have been lost. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0688ba..2ae1a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,9 @@ addons: install: - ARCH=`uname -p` - echo $ARCH -- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz"; -- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz"; -- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.5_10.tar.gz"; +- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz"; +- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz"; +- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"; - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] bekionel opened a new pull request #304: Use https URLs when possible
bekionel opened a new pull request #304: URL: https://github.com/apache/tomcat/pull/304 - This is a follow up to https://github.com/apache/tomcat/commit/82f764ccec2 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add a code generator for server.xml by taking advantage of the digester
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 564c000 Add a code generator for server.xml by taking advantage of
the digester
564c000 is described below
commit 564c575f630ccc432b0ba9b52adefe4387aa
Author: remm
AuthorDate: Thu Jun 18 15:07:39 2020 +0200
Add a code generator for server.xml by taking advantage of the digester
This produces a Tomcat embedded out of server.xml. Only the rules used
by server.xml have code generation at the moment. The code is generated
in the work directory.
Also minor refactorings and simplifications, like for the properties
related rules which could use the main one.
For some reason, it is only marginally faster than actually using the
digester and regular XML parsing. I expected better results overall and
it could be useful to investigate.
However this still has benefits:
- It is better for AOT compilation; I will likely be moving the Tomcat
standalone "blueprint" for AOT compilation use from res/tomcat-maven to
a new module since this will eventually expand to include all the extra
steps that can benefit AOT
- It can be educational about how to use the Tomcat embedded API
- People using Tomcat embedded could use it to generate code for complex
configurations, and this guarantees server.xml equivalence
- Maybe there will be benefits if the technique is applied to the larger
and more numerous web.xml files (but it is possible other methods are
better there, I will investigate)
---
.../apache/catalina/startup/AddPortOffsetRule.java | 7 ++
java/org/apache/catalina/startup/Catalina.java | 137 +++--
.../catalina/startup/CertificateCreateRule.java| 11 +-
.../catalina/startup/ConnectorCreateRule.java | 31 -
.../apache/catalina/startup/ContextRuleSet.java| 2 +-
.../startup/CopyParentClassLoaderRule.java | 6 +
.../catalina/startup/LifecycleListenerRule.java| 6 +
.../org/apache/catalina/startup/NamingRuleSet.java | 12 +-
.../catalina/startup/SetAllPropertiesRule.java | 52 ++--
.../catalina/startup/SetContextPropertiesRule.java | 42 +--
.../apache/catalina/startup/SetNextNamingRule.java | 7 ++
.../org/apache/tomcat/util/IntrospectionUtils.java | 31 -
.../tomcat/util/descriptor/web/ContextEjb.java | 4 +
.../util/descriptor/web/ContextEnvironment.java| 4 +
.../tomcat/util/descriptor/web/ContextHandler.java | 4 +
.../util/descriptor/web/ContextLocalEjb.java | 4 +
.../util/descriptor/web/ContextResource.java | 4 +
.../util/descriptor/web/ContextResourceEnvRef.java | 4 +
.../util/descriptor/web/ContextResourceLink.java | 4 +
.../tomcat/util/descriptor/web/ContextService.java | 4 +
.../util/descriptor/web/MessageDestination.java| 4 +
.../util/descriptor/web/MessageDestinationRef.java | 4 +
.../tomcat/util/descriptor/web/ResourceBase.java | 10 ++
.../tomcat/util/digester/CallMethodRule.java | 14 +++
java/org/apache/tomcat/util/digester/Digester.java | 27
.../tomcat/util/digester/ObjectCreateRule.java | 10 ++
.../apache/tomcat/util/digester/SetNextRule.java | 6 +
.../tomcat/util/digester/SetPropertiesRule.java| 48 +++-
28 files changed, 355 insertions(+), 144 deletions(-)
diff --git a/java/org/apache/catalina/startup/AddPortOffsetRule.java
b/java/org/apache/catalina/startup/AddPortOffsetRule.java
index 9b961cb..50f3fc0 100644
--- a/java/org/apache/catalina/startup/AddPortOffsetRule.java
+++ b/java/org/apache/catalina/startup/AddPortOffsetRule.java
@@ -32,5 +32,12 @@ public class AddPortOffsetRule extends Rule {
int portOffset = server.getPortOffset();
conn.setPortOffset(portOffset);
+
+StringBuilder code = digester.getGeneratedCode();
+if (code != null) {
+
code.append(digester.toVariableName(conn)).append(".setPortOffset(");
+
code.append(digester.toVariableName(server)).append(".getPortOffset());");
+code.append(System.lineSeparator());
+}
}
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 4761571..0b23219 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -19,6 +19,7 @@ package org.apache.catalina.startup;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import java.util.logging.LogManager;
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 2 new comments and 1 new edit on this page Servlet TCK 5.0 (DRAFT) 2 new comments Olivier Lamy Error page attributes maybe related to https://github.com/eclipse-ee4j/jakartaee-tck/pull/277 View comment • Reply • Like Mark Thomas Looks like it. That at least explains how the test passed previously. I was wondering. View comment • Reply • Like 1 new edit Mark Thomas edited this page Here's what changed: ... ... server.xml Enable h2c on port 8080, and add some trailer headers ... Tomcat config for Servlet 4.0 setenv.[sh|bat] Set the following system properties ... ... server.xml Enable h2c on port 8080, and add some trailer headers ... Enable TLS on port 8443 ... A default 10.0.x build (as of 2020-06-18) with the above configuration and the TCK built from source (as of 2020-06-18) triggers 32 25 test failures 1 Expected failures ... PR 338 Incorrect major version (1 failure), Using LF rather an CRLF (15 failures) Strange /j_security_check test (2 failures) Error page attributes assumed to be unset when spec requires them to be set (3 failures) Missing annotation marker in Java 8 signature tests (1 failure) 10 2 failures suspected to be related to incomplete configuration or additional TCK bugsclient-cert configuration. Signature tests with Java 11 not yet tested. Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 1 new edit on this page Servlet TCK 5.0 (DRAFT) Mark Thomas edited this page Here's what changed: ... A default 10.0.x build (as of 2020-06-18) with the above configuration and the TCK built from source (as of 2020-06-18) triggers 32 test failures 1 Expected failures 1 x default context path test as Tomcat configuration always overrides this TCK bugs PR 338 Incorrect major version (1 failure), Using LF rather an CRLF (15 failures) ... Strange /j_security_check test (2 failures) Error page attributes assumed to be unset when spec requires them to be set (3 failures) 10 failures suspected to be related to incomplete configuration or additional TCK bugs Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
