svn commit: r1618565 - in /tomcat/trunk: java/org/apache/jasper/el/JasperELResolver.java test/org/apache/jasper/el/TestJasperELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Mon Aug 18 09:24:38 2014
New Revision: 1618565
URL: http://svn.apache.org/r1618565
Log:
Fix logic error. No functional impact but the code would have been a little
slower.
Based on a patch by martinschaef.
This closes #13
Modified:
tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1618565&r1=1618564&r2=1618565&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java Mon Aug 18
09:24:38 2014
@@ -69,7 +69,7 @@ public class JasperELResolver extends Co
public synchronized void add(ELResolver elResolver) {
super.add(elResolver);
-if (resolvers.length < size) {
+if (resolvers.length > size) {
resolvers[size] = elResolver;
} else {
ELResolver[] nr = new ELResolver[size + 1];
Modified: tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java?rev=1618565&r1=1618564&r2=1618565&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java (original)
+++ tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java Mon Aug 18
09:24:38 2014
@@ -62,7 +62,6 @@ public class TestJasperELResolver {
((ELResolver[])getField("resolvers", resolver)).length);
Assert.assertEquals(Integer.valueOf(9 + count),
getField("size", resolver));
-
}
private static final Object getField(String name, Object target)
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1618565&r1=1618564&r2=1618565&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 18 09:24:38 2014
@@ -44,6 +44,17 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+
+Correct a logic error in the JasperElResolver. There was
no
+functional impact but the code was less efficient as a result of the
+error. Based on a patch by martinschaef. (markt)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Update JasperELResolver.java
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/13 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618567 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/el/JasperELResolver.java test/org/apache/jasper/el/TestJasperELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Mon Aug 18 09:26:53 2014
New Revision: 1618567
URL: http://svn.apache.org/r1618567
Log:
Fix logic error. No functional impact but the code would have been a little
slower.
Based on a patch by martinschaef.
This closes #13
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1618565
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1618567&r1=1618566&r2=1618567&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java Mon
Aug 18 09:26:53 2014
@@ -63,7 +63,7 @@ public class JasperELResolver extends Co
public synchronized void add(ELResolver elResolver) {
super.add(elResolver);
-if (resolvers.length < size) {
+if (resolvers.length > size) {
resolvers[size] = elResolver;
} else {
ELResolver[] nr = new ELResolver[size + 1];
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java?rev=1618567&r1=1618566&r2=1618567&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
Mon Aug 18 09:26:53 2014
@@ -59,7 +59,6 @@ public class TestJasperELResolver {
((ELResolver[])getField("resolvers", resolver)).length);
Assert.assertEquals(Integer.valueOf(7 + count),
getField("size", resolver));
-
}
private static final Object getField(String name, Object target)
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1618567&r1=1618566&r2=1618567&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 18 09:26:53 2014
@@ -115,6 +115,11 @@
treat bridge methods as duplicates of the method they bridge to. In
this
case always call the target of the bridge method. (markt)
+
+Correct a logic error in the JasperElResolver. There was
no
+functional impact but the code was less efficient as a result of the
+error. Based on a patch by martinschaef. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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/376 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1618565 Blamelist: markt BUILD FAILED: failed compile 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.11
On 15/08/2014 21:07, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.11 release is now available for voting. > > The main changes since 8.0.9 are: > - Various improvements to the Mapper including fixing some concurrency > bugs > - Update to Tomcat Native Library version 1.1.31 to pick up the Windows > binaries that are based on OpenSSL 1.0.1h > - Start to add permessage-deflate to WebSocket. Currently only client > to server compression is supported. > - Support for using the OpenSSL cipher syntax with JSSE connectors > - Numerous bug fixes > > There is also the usual collection of bug fixes, new features and > performance improvements. For full details, see the changelog: > http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.11/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1020/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_11/ > > The proposed 8.0.11 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.11 Unit tests pass on OSX, Windows and Linux (all 64-bit, BIO, NIO, NIO2 and APR/native). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56614] Add a switch to ignore annotations detection on tag instances for performance reason
https://issues.apache.org/bugzilla/show_bug.cgi?id=56614 --- Comment #5 from Mark Thomas --- Are these performance figures obtained with tag handler pooling enabled or disabled? If disabled, why was pooling disabled? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56614] Add a switch to ignore annotations detection on tag instances for performance reason
https://issues.apache.org/bugzilla/show_bug.cgi?id=56614 --- Comment #6 from Mark Thomas --- Does the (apparrently undocumented) Context attribute ignoreAnnotations help? That disables annotation scanning for @PreDestroy and @PostConstruct for all components - not just tag handlers. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56614] Add a switch to ignore annotations detection on tag instances for performance reason
https://issues.apache.org/bugzilla/show_bug.cgi?id=56614 --- Comment #7 from Mark Thomas --- If the patch is applied then a few changes will be required: - config option needs to be documented - new option doesn't just disabled @PreDestroy and @PostConstruct, it disables ot for JSPs as well - a few renames are in order to reflect the previous point -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56703] "Current number of backend connections" counter ever increasing when timeouts are defined
https://issues.apache.org/bugzilla/show_bug.cgi?id=56703 --- Comment #8 from Martin Knoblauch --- Hi Rainer, in order to minimize risk, I applied your changes on top of 1.2.40 as used by the high-volume/productive setup. So far (long weekend plus the working hours of today) the results are good, but not perfect: - the "connected" counter does no longer grow without bounds and decays back to 0 if a tomcat is idle for a sufficiently long time - unfortunately I have observer one worker, where the counter turned negative "-1". It only happened once in my setup, and I do not care to much about that effect. Others might of course care more. Either we: - ignore it, or - debug it, or - do the "connected--" only if "connected > 0" I am willing to help, but there are limits to the extend of experimenting I am allowed to do on the productive setup Cheers Martin -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56867] New: WAR with exploded dir not updated from WAR on Tomcat startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56867 Bug ID: 56867 Summary: WAR with exploded dir not updated from WAR on Tomcat startup Product: Tomcat 8 Version: 8.0.9 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: zigarn+apa...@gmail.com Created attachment 31928 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31928&action=edit use-case to test the bug 1. Configure a Tomcat instance with the server.xml from archive provided in attachment 2. Start Tomcat 3. Copy webapps/v1/webapp.war into $CATALINA_BASE/webapps/ Result: webapp is deployed as expected and available at http://localhost:8080/webapp/ with text "Webapp v1". The WAR was exploded into $CATALINA_BASE/webapps/webapp/ folder 4. Stop Tomcat 5. Copy webapps/v2/webapp.war into CATALINA_BASE/webapps/ 6. Start Tomcat Result: old version is still served at http://localhost:8080/webapp/ with text "Webapp v1" Expected: the exploded dir $CATALINA_BASE/webapps/webapp/ is removed and the new version of WAR is deployed and available at http://localhost:8080/webapp/ with text "Webapp v2". Or am I misunderstanding the documentation http://tomcat.apache.org/tomcat-8.0-doc/deployer-howto.html#Deployment_on_Tomcat_startup ? Reproduced with tomcat-7.0.55. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56867] WAR with exploded dir not updated from WAR on Tomcat startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56867 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- Ask on the users list if you don't understand why this behaviour is expected. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618650 - in /tomcat/trunk: build.properties.default java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Author: jfclere
Date: Mon Aug 18 16:14:30 2014
New Revision: 1618650
URL: http://svn.apache.org/r1618650
Log:
Allow to use MS Windows keystore.
submitted by ehsavoie (Emmanuel Hugonnet ).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618650&r1=1618649&r2=1618650&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Aug 18 16:14:30 2014
@@ -238,3 +238,4 @@ cobertura.loc=${base-sf.loc}/cobertura/c
# - JVM settings for unit tests
java.net.preferIPv4Stack=false
+test.entry=org.apache.tomcat.util.net.TestSsl
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1618650&r1=1618649&r2=1618650&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Aug 18 16:14:30 2014
@@ -295,6 +295,8 @@ public class JSSESocketFactory implement
String keystoreFile = endpoint.getKeystoreFile();
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
+if("Windows-MY".equals(type))
+keystoreFile = "";
return getStore(type, provider, keystoreFile, pass);
}
@@ -310,6 +312,8 @@ public class JSSESocketFactory implement
if(truststoreFile == null) {
truststoreFile = System.getProperty("javax.net.ssl.trustStore");
}
+if("Windows-ROOT".equals(keystoreType))
+truststoreFile = "";
if(log.isDebugEnabled()) {
log.debug("Truststore = " + truststoreFile);
}
-
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/377 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1618650 Blamelist: jfclere Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat-maven-plugin pull request: Adding default init so the mime ...
GitHub user bdemers opened a pull request: https://github.com/apache/tomcat-maven-plugin/pull/10 Adding default init so the mime types are set for the static content MTOMCAT-275 You can merge this pull request into a Git repository by running: $ git pull https://github.com/bdemers/tomcat-maven-plugin static-mime-type Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat-maven-plugin/pull/10.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #10 commit 4c7129aefef90e3413c441a44fe4600644110bc9 Author: bdemers Date: 2014-08-18T16:46:54Z Adding default init so the mime types are set for the static content --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-275) Resources served from static context do NOT have Content-Type set
Brian Demers created MTOMCAT-275: Summary: Resources served from static context do NOT have Content-Type set Key: MTOMCAT-275 URL: https://issues.apache.org/jira/browse/MTOMCAT-275 Project: Apache Tomcat Maven Plugin Issue Type: Bug Reporter: Brian Demers This causes issues when serving css for IE (the css is ignored because of the missing header) -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-275) Resources served from static context do NOT have Content-Type set
[ https://issues.apache.org/jira/browse/MTOMCAT-275?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14100842#comment-14100842 ] ASF GitHub Bot commented on MTOMCAT-275: GitHub user bdemers opened a pull request: https://github.com/apache/tomcat-maven-plugin/pull/10 Adding default init so the mime types are set for the static content MTOMCAT-275 You can merge this pull request into a Git repository by running: $ git pull https://github.com/bdemers/tomcat-maven-plugin static-mime-type Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat-maven-plugin/pull/10.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #10 commit 4c7129aefef90e3413c441a44fe4600644110bc9 Author: bdemers Date: 2014-08-18T16:46:54Z Adding default init so the mime types are set for the static content > Resources served from static context do NOT have Content-Type set > - > > Key: MTOMCAT-275 > URL: https://issues.apache.org/jira/browse/MTOMCAT-275 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Brian Demers > > This causes issues when serving css for IE (the css is ignored because of the > missing header) -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-275) Resources served from static context do NOT have Content-Type set
[ https://issues.apache.org/jira/browse/MTOMCAT-275?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14100847#comment-14100847 ] Brian Demers commented on MTOMCAT-275: -- Single line pull request here: https://github.com/apache/tomcat-maven-plugin/pull/10 Sorry, no test, I spent some time trying to get the existing IT to pass without this change, without success. NOTE: IT's fail with on JDK1.6 and JDK1.7 > Resources served from static context do NOT have Content-Type set > - > > Key: MTOMCAT-275 > URL: https://issues.apache.org/jira/browse/MTOMCAT-275 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Brian Demers > > This causes issues when serving css for IE (the css is ignored because of the > missing header) -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618678 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Author: markt Date: Mon Aug 18 17:59:12 2014 New Revision: 1618678 URL: http://svn.apache.org/r1618678 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56323 Include the *.bat files when installing Tomcat via the Windows installer. Modified: tomcat/trunk/res/tomcat.nsi tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1618678&r1=1618677&r2=1618678&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Mon Aug 18 17:59:12 2014 @@ -184,6 +184,7 @@ Section "Core" SecTomcatCore SetOutPath $INSTDIR\bin File bin\bootstrap.jar File bin\tomcat-juli.jar + File bin\*.bat SetOutPath $INSTDIR\conf File conf\*.* SetOutPath $INSTDIR\webapps\ROOT Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1618678&r1=1618677&r2=1618678&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 18 17:59:12 2014 @@ -54,6 +54,14 @@ + + + +56323: Include the *.bat files when installing +Tomcat via the Windows installer. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56323] Include service .bat scripts with Microsoft Windows Installer package
https://issues.apache.org/bugzilla/show_bug.cgi?id=56323 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in 8.0.x for 8.0.12 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618685 - /tomcat/trunk/build.properties.default
Author: kkolinko
Date: Mon Aug 18 18:08:59 2014
New Revision: 1618685
URL: http://svn.apache.org/r1618685
Log:
Followup to r1618650
Revert unintended change that limited the testsuite to a single test.
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618685&r1=1618684&r2=1618685&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Aug 18 18:08:59 2014
@@ -238,4 +238,3 @@ cobertura.loc=${base-sf.loc}/cobertura/c
# - JVM settings for unit tests
java.net.preferIPv4Stack=false
-test.entry=org.apache.tomcat.util.net.TestSsl
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618688 - /tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Author: markt
Date: Mon Aug 18 18:09:59 2014
New Revision: 1618688
URL: http://svn.apache.org/r1618688
Log:
Whitespace
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1618688&r1=1618687&r2=1618688&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Mon
Aug 18 18:09:59 2014
@@ -52,8 +52,6 @@ public class PerMessageDeflate implement
private boolean skipDecompression = false;
static PerMessageDeflate negotiate(List> preferences) {
-
-
// Accept the first preference that the server is able to support
for (List preference : preferences) {
boolean ok = true;
@@ -144,6 +142,7 @@ public class PerMessageDeflate implement
return null;
}
+
private PerMessageDeflate(boolean serverContextTakeover, int
serverMaxWindowBits,
boolean clientContextTakeover, int clientMaxWindowBits) {
this.serverContextTakeover = serverContextTakeover;
@@ -156,7 +155,6 @@ public class PerMessageDeflate implement
@Override
public TransformationResult getMoreData(byte opCode, boolean fin, int rsv,
ByteBuffer dest)
throws IOException {
-
// Control frames are never compressed and may appear in the middle of
// a WebSocket method. Pass them straight through.
if (Util.isControl(opCode)) {
@@ -239,6 +237,7 @@ public class PerMessageDeflate implement
}
}
+
@Override
public Extension getExtensionResponse() {
Extension result = new WsExtension(NAME);
@@ -263,6 +262,7 @@ public class PerMessageDeflate implement
return result;
}
+
@Override
public void setNext(Transformation t) {
if (next == null) {
@@ -272,6 +272,7 @@ public class PerMessageDeflate implement
}
}
+
@Override
public boolean validateRsvBits(int i) {
if ((i & RSV_BITMASK) > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1618650 - in /tomcat/trunk: build.properties.default java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
2014-08-18 20:14 GMT+04:00 :
> Author: jfclere
> Date: Mon Aug 18 16:14:30 2014
> New Revision: 1618650
>
> URL: http://svn.apache.org/r1618650
> Log:
> Allow to use MS Windows keystore.
> submitted by ehsavoie (Emmanuel Hugonnet ).
>
> Modified:
> tomcat/trunk/build.properties.default
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>
1. Documentation =?,
2. I think this is already configurable by setting keystoreFile="" and
truststoreFile="" on a .
See
https://issues.apache.org/bugzilla/show_bug.cgi?id=56021
http://svn.apache.org/r1559573
http://svn.apache.org/r1559575
Tomcat 7.0.51 changelog says:
56021: Make it possible to use the Windows-MY key store with
the BIO and NIO connectors for SSL configuration. It requires a
keystoreFile=""
keystoreType="Windows-My"
to be set on the connector. Based on a patch provided by Asanka. (markt)
3. In issue 56021 the keystoreType was spelled "Windows-My". Why are
you spelling it as "Windows-MY"?
4. Changelog = ?
5. I reverted the change to build.properties.default
Best regards,
Konstantin Kolinko
> Modified: tomcat/trunk/build.properties.default
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618650&r1=1618649&r2=1618650&view=diff
> ==
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Mon Aug 18 16:14:30 2014
> @@ -238,3 +238,4 @@ cobertura.loc=${base-sf.loc}/cobertura/c
>
> # - JVM settings for unit tests
> java.net.preferIPv4Stack=false
> +test.entry=org.apache.tomcat.util.net.TestSsl
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1618650&r1=1618649&r2=1618650&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> Mon Aug 18 16:14:30 2014
> @@ -295,6 +295,8 @@ public class JSSESocketFactory implement
> String keystoreFile = endpoint.getKeystoreFile();
> if (keystoreFile == null)
> keystoreFile = defaultKeystoreFile;
> +if("Windows-MY".equals(type))
> +keystoreFile = "";
>
> return getStore(type, provider, keystoreFile, pass);
> }
> @@ -310,6 +312,8 @@ public class JSSESocketFactory implement
> if(truststoreFile == null) {
> truststoreFile = System.getProperty("javax.net.ssl.trustStore");
> }
> +if("Windows-ROOT".equals(keystoreType))
> +truststoreFile = "";
> if(log.isDebugEnabled()) {
> log.debug("Truststore = " + truststoreFile);
> }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1618704 - /tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Author: markt
Date: Mon Aug 18 18:52:04 2014
New Revision: 1618704
URL: http://svn.apache.org/r1618704
Log:
Add a little plumbing for outgoing messages (no actual compression yet)
Make a couple of fields volatile that are accessed by multiple threads (in
succession, not in parallel)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1618704&r1=1618703&r2=1618704&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Mon
Aug 18 18:52:04 2014
@@ -18,6 +18,7 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
import java.util.List;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
@@ -48,8 +49,8 @@ public class PerMessageDeflate implement
private final Inflater inflator = new Inflater(true);
private final ByteBuffer readBuffer = ByteBuffer.allocate(8192);
-private Transformation next;
-private boolean skipDecompression = false;
+private volatile Transformation next;
+private volatile boolean skipDecompression = false;
static PerMessageDeflate negotiate(List> preferences) {
// Accept the first preference that the server is able to support
@@ -288,11 +289,24 @@ public class PerMessageDeflate implement
@Override
public List sendMessagePart(List messageParts) {
-// TODO: Implement compression of sent messages
+List compressedParts = new
ArrayList<>(messageParts.size());
+
+for (MessagePart messagePart : messageParts) {
+byte opCode = messagePart.getOpCode();
+if (Util.isControl(opCode)) {
+// Control messages can appear in the middle of other messages
+// and must not be compressed. Pass it straight through
+compressedParts.add(messagePart);
+} else {
+// TODO: Implement compression of sent messages
+compressedParts.add(messagePart);
+}
+}
+
if (next == null) {
-return messageParts;
+return compressedParts;
} else {
-return next.sendMessagePart(messageParts);
+return next.sendMessagePart(compressedParts);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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/379 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1618688 Blamelist: kkolinko,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
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2014-08-19 0:58 GMT+04:00 : > 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/379 > > Buildbot URL: http://ci.apache.org/ > > Buildslave for this Build: bb-vm_ubuntu > > Build Reason: scheduler > Build Source Stamp: [branch tomcat/trunk] 1618688 > Blamelist: kkolinko,markt > > BUILD FAILED: failed compile_1 stdio says: [junit] Running org.apache.jasper.compiler.TestCompiler (...) (Tomcat messages, using NIO2 connector...) [junit] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 56.974 sec [junit] Test org.apache.jasper.compiler.TestCompiler FAILED So the failures count is zero, errors count is zero, but JUnit reported the test as failure. I think there is no thing for us to look there. There should have been something else happening on that server to cause the test to run for 57 seconds. In my 8.0.9 testing this test execution time is in 10-14 seconds range for all 4 connectors. The other two runs of the same test (BIO, NIO) completed in 16 seconds. The logs for that test run: http://ci.apache.org/projects/tomcat/tomcat8/logs/1618688/ Best regards, Konstantin Kolinko - 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/380 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1618704 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.11
[X] Stable - go ahead and release as 8.0.11 Looks good over here. On Mon, Aug 18, 2014 at 8:28 AM, Mark Thomas wrote: > On 15/08/2014 21:07, Mark Thomas wrote: > > The proposed Apache Tomcat 8.0.11 release is now available for voting. > > > > The main changes since 8.0.9 are: > > - Various improvements to the Mapper including fixing some concurrency > > bugs > > - Update to Tomcat Native Library version 1.1.31 to pick up the Windows > > binaries that are based on OpenSSL 1.0.1h > > - Start to add permessage-deflate to WebSocket. Currently only client > > to server compression is supported. > > - Support for using the OpenSSL cipher syntax with JSSE connectors > > - Numerous bug fixes > > > > There is also the usual collection of bug fixes, new features and > > performance improvements. For full details, see the changelog: > > > http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > > > It can be obtained from: > > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.11/ > > The Maven staging repo is: > > https://repository.apache.org/content/repositories/orgapachetomcat-1020/ > > The svn tag is: > > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_11/ > > > > The proposed 8.0.11 release is: > > [ ] Broken - do not release > > [X] Stable - go ahead and release as 8.0.11 > > Unit tests pass on OSX, Windows and Linux (all 64-bit, BIO, NIO, NIO2 > and APR/native). > > Mark > > - > 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.11
+1 On 19 August 2014 00:28, Mark Thomas wrote: > On 15/08/2014 21:07, Mark Thomas wrote: >> The proposed Apache Tomcat 8.0.11 release is now available for voting. >> >> The main changes since 8.0.9 are: >> - Various improvements to the Mapper including fixing some concurrency >> bugs >> - Update to Tomcat Native Library version 1.1.31 to pick up the Windows >> binaries that are based on OpenSSL 1.0.1h >> - Start to add permessage-deflate to WebSocket. Currently only client >> to server compression is supported. >> - Support for using the OpenSSL cipher syntax with JSSE connectors >> - Numerous bug fixes >> >> There is also the usual collection of bug fixes, new features and >> performance improvements. For full details, see the changelog: >> http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.11/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1020/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_11/ >> >> The proposed 8.0.11 release is: >> [ ] Broken - do not release >> [X] Stable - go ahead and release as 8.0.11 > > Unit tests pass on OSX, Windows and Linux (all 64-bit, BIO, NIO, NIO2 > and APR/native). > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Olivier Lamy Ecetera: http://ecetera.com.au http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) 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-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 26 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins 47 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140819.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pub lic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140819.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140819.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/t
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) 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-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 26 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins 2 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140819.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pu blic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140819.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140819.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/to
[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 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... 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 failed -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 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: 24 mins 57 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20140819/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140819.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140819-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/dest-20140819/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140819.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-7-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bui
svn commit: r1618789 - in /tomcat/maven-plugin/branches/tc8.x: ./ tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/ tomcat7-maven-plugin/src/test/resources/deploy-war-project/ tomcat7-m
Author: olamy Date: Tue Aug 19 03:39:27 2014 New Revision: 1618789 URL: http://svn.apache.org/r1618789 Log: 1. Fix: MTOMCAT-274 (updated maven-war-plugin version). 2. Fix: access_log.* files excluded from apache-rat-plugin configuration. These are generated during Tomcat run and should not be checked. Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1618789&r1=1618788&r2=1618789&view=diff == --- tomcat/maven-plugin/branches/tc8.x/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/pom.xml Tue Aug 19 03:39:27 2014 @@ -767,6 +767,7 @@ out/** .extract/** *.patch + **/access_log.* Modified: tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1618789&r1=1618788&r2=1618789&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Tue Aug 19 03:39:27 2014 @@ -35,7 +35,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1618789&r1=1618788&r2=1618789&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml Tue Aug 19 03:39:27 2014 @@ -35,7 +35,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1618789&r1=1618788&r2=1618789&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml Tue Aug 19 03:39:27 2014 @@ -35,7 +35,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1618789&r1=1618788&r2=1618789&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Tue Aug 19 03:39:27 2014 @@ -35,7 +35,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml URL: http://svn.apache.org/viewvc/tom
svn commit: r1618790 - in /tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src: main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ test/java/org/apache/tomcat/maven/it/
Author: olamy
Date: Tue Aug 19 03:39:37 2014
New Revision: 1618790
URL: http://svn.apache.org/r1618790
Log:
Fix: MTOMCAT-234
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java?rev=1618790&r1=1618789&r2=1618790&view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Tue Aug 19 03:39:37 2014
@@ -800,12 +800,6 @@ public abstract class AbstractRunMojo
}
@Override
-public String[] list( String path )
-{
-return super.list( path );
-}
-
-@Override
public WebResource getResource( String path )
{
File file = new File( path );
@@ -817,23 +811,6 @@ public abstract class AbstractRunMojo
return webResource;
}
-@Override
-public WebResource getClassLoaderResource( String path )
-{
-if ( this.webResourceSet != null )
-{
-WebResource webResource = this.webResourceSet.getResource(
path );
-return webResource;
-}
-
-return super.getClassLoaderResource( path );
-}
-
-@Override
-public void addJarResources( WebResourceSet webResourceSet )
-{
-this.webResourceSet = webResourceSet;
-}
}
/**
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java?rev=1618790&r1=1618789&r2=1618790&view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
Tue Aug 19 03:39:37 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.maven.it;
*/
import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractTomcatRunMultiConfigIT;
/**
* @author Olivier Lamy
@@ -31,8 +30,8 @@ public class Tomcat8RunMultiConfigIT
protected void verifyConnectorsStarted()
throws VerificationException
{
-verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-"
+ getHttpItPort() + "\"]");
-verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-"
+ getHttpsItPort() + "\"]");
+verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpItPort() + "\"]");
+verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-"
+ getHttpsItPort() + "\"]");
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"ajp-bio-"
+ getAjpItPort() + "\"]");
}
}
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java?rev=1618790&r1=1618789&r2=1618790&view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
Tue Aug 19 03:39:37 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.maven.it;
*/
import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT;
/**
* @author Olivier Lamy
@@ -36,7 +35,7 @@ public class Tomcat8SimpleWarProjectIT
protected void verifyConnectorsStarted()
throws VerificationException
{
-
svn commit: r1618791 - in /tomcat/maven-plugin/branches/tc8.x: tomcat-maven-plugin-it/src/main/resources/simple-war-project/ tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/ tomcat6-
Author: olamy Date: Tue Aug 19 03:39:50 2014 New Revision: 1618791 URL: http://svn.apache.org/r1618791 Log: force war plugin version 2.4 Modified: tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml Modified: tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml?rev=1618791&r1=1618790&r2=1618791&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/simple-war-project/pom.xml Tue Aug 19 03:39:50 2014 @@ -36,7 +36,7 @@ maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.tomcat.maven Modified: tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml?rev=1618791&r1=1618790&r2=1618791&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml Tue Aug 19 03:39:50 2014 @@ -49,6 +49,7 @@ maven-war-plugin +2.4 src/main/webapp/web.xml Modified: tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1618791&r1=1618790&r2=1618791&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Tue Aug 19 03:39:50 2014 @@ -32,7 +32,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1618791&r1=1618790&r2=1618791&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml Tue Aug 19 03:39:50 2014 @@ -32,7 +32,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1-alpha-2 + 2.4 org.apache.maven.plugins Modified: tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1618791&r1=1618790&r2=1618791&view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plu
svn commit: r1618792 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Tue Aug 19 03:44:21 2014
New Revision: 1618792
URL: http://svn.apache.org/r1618792
Log:
Adding default init so the mime types are set for the static content
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1618792&r1=1618791&r2=1618792&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Tue Aug 19 03:44:21 2014
@@ -1496,6 +1496,7 @@ public abstract class AbstractRunMojo
if ( staticContextDocbase != null )
{
Context staticContext = container.addContext( staticContextPath,
staticContextDocbase );
+Tomcat.initWebappDefaults(staticContext);
staticContext.setPrivileged( true );
Wrapper servlet = context.createWrapper();
servlet.setServletClass( DefaultServlet.class.getName() );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1618650 - in /tomcat/trunk: build.properties.default java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
On 08/18/2014 08:21 PM, Konstantin Kolinko wrote:
2014-08-18 20:14 GMT+04:00 :
Author: jfclere
Date: Mon Aug 18 16:14:30 2014
New Revision: 1618650
URL: http://svn.apache.org/r1618650
Log:
Allow to use MS Windows keystore.
submitted by ehsavoie (Emmanuel Hugonnet ).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
1. Documentation =?,
2. I think this is already configurable by setting keystoreFile="" and
truststoreFile="" on a .
If someone uses the MS Windows keystore the keystore and the truststore
file(s) needs to be "".
Cheers
Jean-Frederic
See
https://issues.apache.org/bugzilla/show_bug.cgi?id=56021
http://svn.apache.org/r1559573
http://svn.apache.org/r1559575
Tomcat 7.0.51 changelog says:
56021: Make it possible to use the Windows-MY key store with
the BIO and NIO connectors for SSL configuration. It requires a
keystoreFile=""
keystoreType="Windows-My"
to be set on the connector. Based on a patch provided by Asanka.
(markt)
3. In issue 56021 the keystoreType was spelled "Windows-My". Why are
you spelling it as "Windows-MY"?
4. Changelog = ?
5. I reverted the change to build.properties.default
Best regards,
Konstantin Kolinko
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618650&r1=1618649&r2=1618650&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Aug 18 16:14:30 2014
@@ -238,3 +238,4 @@ cobertura.loc=${base-sf.loc}/cobertura/c
# - JVM settings for unit tests
java.net.preferIPv4Stack=false
+test.entry=org.apache.tomcat.util.net.TestSsl
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1618650&r1=1618649&r2=1618650&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Aug 18 16:14:30 2014
@@ -295,6 +295,8 @@ public class JSSESocketFactory implement
String keystoreFile = endpoint.getKeystoreFile();
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
+if("Windows-MY".equals(type))
+keystoreFile = "";
return getStore(type, provider, keystoreFile, pass);
}
@@ -310,6 +312,8 @@ public class JSSESocketFactory implement
if(truststoreFile == null) {
truststoreFile = System.getProperty("javax.net.ssl.trustStore");
}
+if("Windows-ROOT".equals(keystoreType))
+truststoreFile = "";
if(log.isDebugEnabled()) {
log.debug("Truststore = " + truststoreFile);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
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.11
2014-08-15 22:07 GMT+02:00 Mark Thomas : > The proposed 8.0.11 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.11 > > Looking good with more fixes (like NIO2 "sendfile"). Rémy
Re: svn commit: r1618650 - in /tomcat/trunk: build.properties.default java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
On 19/08/2014 07:16, jean-frederic clere wrote:
> On 08/18/2014 08:21 PM, Konstantin Kolinko wrote:
>> 2014-08-18 20:14 GMT+04:00 :
>>> Author: jfclere
>>> Date: Mon Aug 18 16:14:30 2014
>>> New Revision: 1618650
>>>
>>> URL: http://svn.apache.org/r1618650
>>> Log:
>>> Allow to use MS Windows keystore.
>>> submitted by ehsavoie (Emmanuel Hugonnet ).
>>>
>>> Modified:
>>> tomcat/trunk/build.properties.default
>>>
>>> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>>>
>>
>> 1. Documentation =?,
>> 2. I think this is already configurable by setting keystoreFile="" and
>> truststoreFile="" on a .
>
> If someone uses the MS Windows keystore the keystore and the truststore
> file(s) needs to be "".
That doesn't really answer Konstantin's point 2.
To put it another way, it has been possible to use the MSWindows
keystore since 7.0.51 so the svn log message is not correct.
Do you plan to address the other points Konstantin raised?
Mark
> Cheers
>
> Jean-Frederic
>
>>
>> See
>> https://issues.apache.org/bugzilla/show_bug.cgi?id=56021
>> http://svn.apache.org/r1559573
>> http://svn.apache.org/r1559575
>>
>> Tomcat 7.0.51 changelog says:
>>
>> 56021: Make it possible to use the Windows-MY key
>> store with
>> the BIO and NIO connectors for SSL configuration. It requires a
>> keystoreFile=""
>> keystoreType="Windows-My"
>> to be set on the connector. Based on a patch provided by
>> Asanka. (markt)
>>
>>
>> 3. In issue 56021 the keystoreType was spelled "Windows-My". Why are
>> you spelling it as "Windows-MY"?
>>
>> 4. Changelog = ?
>> 5. I reverted the change to build.properties.default
>>
>> Best regards,
>> Konstantin Kolinko
>>
>>> Modified: tomcat/trunk/build.properties.default
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618650&r1=1618649&r2=1618650&view=diff
>>>
>>> ==
>>>
>>> --- tomcat/trunk/build.properties.default (original)
>>> +++ tomcat/trunk/build.properties.default Mon Aug 18 16:14:30 2014
>>> @@ -238,3 +238,4 @@ cobertura.loc=${base-sf.loc}/cobertura/c
>>>
>>> # - JVM settings for unit tests
>>> java.net.preferIPv4Stack=false
>>> +test.entry=org.apache.tomcat.util.net.TestSsl
>>>
>>> Modified:
>>> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1618650&r1=1618649&r2=1618650&view=diff
>>>
>>> ==
>>>
>>> ---
>>> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>>> (original)
>>> +++
>>> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>>> Mon Aug 18 16:14:30 2014
>>> @@ -295,6 +295,8 @@ public class JSSESocketFactory implement
>>> String keystoreFile = endpoint.getKeystoreFile();
>>> if (keystoreFile == null)
>>> keystoreFile = defaultKeystoreFile;
>>> +if("Windows-MY".equals(type))
Any reason not to make this a case insensitive comparison?
>>> +keystoreFile = "";
>>> return getStore(type, provider, keystoreFile, pass);
>>> }
>>> @@ -310,6 +312,8 @@ public class JSSESocketFactory implement
>>> if(truststoreFile == null) {
>>> truststoreFile =
>>> System.getProperty("javax.net.ssl.trustStore");
>>> }
>>> +if("Windows-ROOT".equals(keystoreType))
Same here.
>>> +truststoreFile = "";
>>> if(log.isDebugEnabled()) {
>>> log.debug("Truststore = " + truststoreFile);
>>> }
>>>
>>>
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
