Re: [VOTE] Release Apache Tomcat 7.0.28
On 15.06.2012 11:14, Mark Thomas wrote:
The proposed Apache Tomcat 7.0.28 release is now available for voting.
It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.28/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-243/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/
The proposed 7.0.27 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 7.0.28 Stable
+1 to release
Most noteable observation: File conf/web.xml now is open 9 times in
parallel (9 file descriptors), was 4 times in 7.0.27.
Details:
- MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src consistent with svn tag, except for the following minor points
(no regression)
- line ends of modules/jdbc-pool/resources/MANIFEST.MF differ
between svn and gz although eol-style is set correctly.
- the files we copy before building, e.g.
catalina.properties and jdbc-pool.xml are of course
not in svn for the cp target location, but they are
in the src bundles.
- builds fine
- build result looks consistent with binaries
- no checkstyle complaints
- some Javadoc warnings (only in jdbc-pool, see below)
- Unit tests no failures, but some warnings (see below)
- JMX MBean-Comparison
- some additional file descriptors, most prominent the file
conf/web.xml was open in parallel 4 times for 7.0.27, now
it is open in parallel 9 times (!) for 7.0.28.
- tldScanTime went up for /docs from 7 to 53 (maybe not significant)
and for /examples from 275 to 470 (but varies between 280 and 750)
- Compression Filter filterInitParameterMap changed from
{compressionThreshold=10, debug=0} to
{compressionBuffer=8192, compressionThreshold=128,
compressionMimeTypes=text/html,text/plain,text/xml, debug=0}
- new expected attribute maxHeaderCount in ThreadPool,
Connector and ProtocolHandler MBeans
- new attribute connectionCount in ThreadPool MBeans
- two additional daemon threads ("MessageSender[/examples]" and
"SnakeWebSocketServlet Timer")
Build and tests were done using Java 1.6.0_30, OS was Solaris 10 Sparc,
tcnative was 1.1.24 based on APR 1.4.6 and OpenSSL 1.0.1c (plus two
patches).
Javadoc Warnings in jdbc-pool:
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:544:
warning - Tag @link: can't find getParentLogger in javax.sql.DataSource
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1294:
warning - @inheritDoc used but purge() does not override or implement
any method.
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1305:
warning - @inheritDoc used but purgeOnReturn() does not override or
implement any method.
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1294:
warning - @inheritDoc used but purge() does not override or implement
any method.
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1305:
warning - @inheritDoc used but purgeOnReturn() does not override or
implement any method.
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java:67:
warning - Tag @link: can't find isValid(boolean) in java.sql.Connection
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1294:
warning - @inheritDoc used but purge() does not override or implement
any method.
[javadoc]
/shared/build/dev/tomcat/incoming/tc7.0.x/7.0.28/tmp-7.0.28/apache-tomcat-7.0.28-src-gz/output/dist/src/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java:1305:
warning - @inheritDoc used but purgeOnReturn() does not override or
implement any method.
Unit test warnings:
- org.apache.catalina.deploy.TestWebXmlOrdering
- BIO, NIO and APR: [main]
org.apache.catalina.deploy.WebXml.orderWebFragments Used a wrong
fragment name z at web.xml absolute-ordering tag!
- org.apache.tomcat.util.net.TestCustomSsl
- BIO twice "Exception getting SSL attributes"
- NIO twice "WARNING: Exception re-negotiating SSL connect
svn commit: r1350900 - /tomcat/trunk/res/maven/README.txt
Author: kkolinko Date: Sat Jun 16 10:06:27 2012 New Revision: 1350900 URL: http://svn.apache.org/viewvc?rev=1350900&view=rev Log: Correct typos Modified: tomcat/trunk/res/maven/README.txt Modified: tomcat/trunk/res/maven/README.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/README.txt?rev=1350900&r1=1350899&r2=1350900&view=diff == --- tomcat/trunk/res/maven/README.txt (original) +++ tomcat/trunk/res/maven/README.txt Sat Jun 16 10:06:27 2012 @@ -17,23 +17,25 @@ $Id: README.txt 1234158 2012-01-20 21:44:13Z markt $ -General preparatations before any publishing +General preparations before any publishing: 1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in this directory 2 - Generate a standard Tomcat release (ant release) 3 - Copy mvn.properties.default to mvn.properties and adjust it as necessary. You will need to set asf.ldap.username and you'll probably need to set gpg.exec -The other properties should be OK. NOte you;ll be prompted for your GPG -pass-phrase and LDAP password when the script runs +The other properties should be OK. Note: you will be prompted for your +GPG pass-phrase and LDAP password when the script runs. -To publish a snaphost do the following: +To publish a snapshot do the following: 1 - ant -f mvn-pub.xml deploy-snapshot -This populates https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/ +This populates + https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/ To release do the following: 1 - ant -f mvn-pub.xml deploy-release -that step creates a staging area in https://repository.apache.org/index.html#stagingRepositories +that step creates a staging area in +https://repository.apache.org/index.html#stagingRepositories 2 - check the upload and then close the repository 3 - include the repository in the VOTE thread 4 - in https://repository.apache.org/index.html#stagingRepositories release it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350902 - in /tomcat/tc7.0.x/trunk: ./ res/maven/README.txt
Author: kkolinko Date: Sat Jun 16 10:10:40 2012 New Revision: 1350902 URL: http://svn.apache.org/viewvc?rev=1350902&view=rev Log: Correct typos Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/maven/README.txt Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1350900 Modified: tomcat/tc7.0.x/trunk/res/maven/README.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/README.txt?rev=1350902&r1=1350901&r2=1350902&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/README.txt (original) +++ tomcat/tc7.0.x/trunk/res/maven/README.txt Sat Jun 16 10:10:40 2012 @@ -17,23 +17,25 @@ $Id$ -General preparatations before any publishing +General preparations before any publishing: 1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in this directory 2 - Generate a standard Tomcat release (ant release) 3 - Copy mvn.properties.default to mvn.properties and adjust it as necessary. You will need to set asf.ldap.username and you'll probably need to set gpg.exec -The other properties should be OK. NOte you;ll be prompted for your GPG -pass-phrase and LDAP password when the script runs +The other properties should be OK. Note: you will be prompted for your +GPG pass-phrase and LDAP password when the script runs. -To publish a snaphost do the following: +To publish a snapshot do the following: 1 - ant -f mvn-pub.xml deploy-snapshot -This populates https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/ +This populates + https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/ To release do the following: 1 - ant -f mvn-pub.xml deploy-release -that step creates a staging area in https://repository.apache.org/index.html#stagingRepositories +that step creates a staging area in +https://repository.apache.org/index.html#stagingRepositories 2 - check the upload and then close the repository 3 - include the repository in the VOTE thread 4 - in https://repository.apache.org/index.html#stagingRepositories release it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-161) Executable WAR: extraDependencies (JARs) should not be extracted but used directly
Manuel Hartl created MTOMCAT-161: Summary: Executable WAR: extraDependencies (JARs) should not be extracted but used directly Key: MTOMCAT-161 URL: https://issues.apache.org/jira/browse/MTOMCAT-161 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat6, tomcat7 Affects Versions: 2.0-beta-1 Environment: tomcat7, windows, maven3 Reporter: Manuel Hartl Assignee: Olivier Lamy (*$^¨%`£) When i create exec-war to create a a self-executable webapp, dependencies (at least extraDependencies) war extracted and added directly to the resulting JAR. the resulting jar contains a META-INF with lots of duplicate MANIFEST files, etc. this at least breaks signed JARs (e.g. JCE providers) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53424] New: Add better support for pre-compilation of jsps in a jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=53424 Priority: P2 Bug ID: 53424 Assignee: dev@tomcat.apache.org Summary: Add better support for pre-compilation of jsps in a jar Severity: normal Classification: Unclassified OS: Windows Vista Reporter: anthonygerrard+apache@gmail.com Hardware: PC Status: NEW Version: 7.0.27 Component: Jasper Product: Tomcat 7 It would be good if the various features of the jsp pre compilation ant task better supported the new servlet 3.0 pluggability features: * ability to load jsp config from META-INF/web-fragment.xml * ability to merge generated config into META-INF/web-fragment.xml * loose any other WEB-INF assumptions that there are -- 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 53424] Add better support for pre-compilation of jsps in a jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=53424 Anthony Gerrard changed: What|Removed |Added CC||anthonygerrard+apache.org@g ||mail.com -- 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
buildbot exception 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/3092 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1350900 Blamelist: kkolinko BUILD FAILED: exception upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/680 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1350902 Blamelist: kkolinko BUILD FAILED: exception upload_2 sincerely, -The Buildbot
Re: [Proposal] Preparatory refactoring for Resource handling refactoring
2012/6/15 Mark Thomas : > All, > > Servlet 3.1 looks like it is going to introduce 'overlays' or something > similar along the lines of the enhancement request [1]. > > Tomcat already has aliases, VirtualDirContext and resource JAR support - > each implemented slightly differently. Things are already rather messy > and will get worse if we build on what we currently have. I have > therefore been looking at a new Resources implementation for Tomcat 8 > that is not based on DirContext. > > Along the way I have noticed a few related refactorings that will be > required / would make life easier. They are: > > 1. Move Loader and Resources from Container to Context > The docs already state these are only for Contexts and they don't > make much sense on other Containers. OK. > 2. Move Mapper to o.a.catlina.connector.mapper > It is only used here and removing DirContext means it will have a > hard dependency on o.a.c.resources (or wherever the new implemenation > goes) so can't stay in o.a.tomcat.util Most of Mapper is agnostic on whatever technology if behind it. MappingData class stores Objects instead of Host, Context etc. Having a DirContext there already means that this abstraction is leaking, so I do not mind the move. I wonder whether interfaces and implementation will be separate, so that Mapper were not really "hard" dependent on implementation details. BTW, maybe "o.a.c.resource". We have "resources" packages elsewhere (Jasper, javax.servlet.**) and they contain some supplementary data, not code. The o.a.naming.resources package is an exception. > I'd like to complete these before I start the main refactoring to a) do > things in stages b) do the bigger refactoring from a slightly cleaner start. > > The broader refactoring aims to provide aliases, overlays, resource JARs > and anything else along those lines through a common interface with the > implementations going directly to the file system. Access via URLs will > also be supported but direct access to the file system will be > preferred. How are you going to handle unpacked WARs ? Some abstraction will still be needed. I wonder how much will it differ from DirContext. DirContext served it purpose, but it looks that it requires too much plumbing (dealing with Names etc). I wonder whether it can survive as a facade to new API. (Though I do not yet know a valid purpose to keep such facade). org.apache.naming.* will survive, because Tomcat still needs JNDI support . URLs are needed per Servlet API, so they cannot be removed. Does our "jndi" schema need DirContext as underlying implementation? I noticed the following commit in archives: http://svn.apache.org/viewvc?view=revision&revision=1137646 so we have to deal with such schema combinations as "jar:jndi:". IIRC there was once a person who complained that our "jndi" schema was clashing with some other implementation of "jndi" schema in an application where he was trying to embed Tomcat. I cannot find that thread in the archives though. I wonder what will happen with org.apache.naming.JndiPermission http://tomcat.apache.org/tomcat-7.0-doc/security-manager-howto.html#Tomcat_Custom_Permissions > I have some rough ideas for this. My plan is to commit the > new classes as I go along so folks can comment and provide feedback but > only commit the changes to existing classes once I have everything working. OK. Though if it is work in progress maybe some comments/summaries will be needed to understand how it is going to be integrated with existing code. > Since this is fairly major work, any objections before I start? > > Cheers, > > Mark > > [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52236 Best regards, Konstantin Kolinko - 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.28
+1: tested with the maven plugin and some projects which use maven artifacts for embed. Thanks! -- Olivier 2012/6/15 Mark Thomas : > The proposed Apache Tomcat 7.0.28 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.28/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-243/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ > > The proposed 7.0.27 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.28 Stable > > Cheers, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Olivier Lamy Talend: http://coders.talend.com 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
Re: [Proposal] Preparatory refactoring for Resource handling refactoring
On 16/06/2012 16:28, Konstantin Kolinko wrote: > 2012/6/15 Mark Thomas : >> All, >> >> Servlet 3.1 looks like it is going to introduce 'overlays' or something >> similar along the lines of the enhancement request [1]. >> >> Tomcat already has aliases, VirtualDirContext and resource JAR support - >> each implemented slightly differently. Things are already rather messy >> and will get worse if we build on what we currently have. I have >> therefore been looking at a new Resources implementation for Tomcat 8 >> that is not based on DirContext. >> >> Along the way I have noticed a few related refactorings that will be >> required / would make life easier. They are: >> >> 1. Move Loader and Resources from Container to Context >> The docs already state these are only for Contexts and they don't >> make much sense on other Containers. > > OK. > >> 2. Move Mapper to o.a.catlina.connector.mapper >> It is only used here and removing DirContext means it will have a >> hard dependency on o.a.c.resources (or wherever the new implemenation >> goes) so can't stay in o.a.tomcat.util > > Most of Mapper is agnostic on whatever technology if behind it. > MappingData class stores Objects instead of Host, Context etc. > > Having a DirContext there already means that this abstraction is > leaking, so I do not mind the move. > > I wonder whether interfaces and implementation will be separate, so > that Mapper were not really "hard" dependent on implementation > details. There will need to be a hard dependency to handle some of the welcome file rules. > BTW, maybe "o.a.c.resource". > We have "resources" packages elsewhere (Jasper, javax.servlet.**) and > they contain some supplementary data, not code. The > o.a.naming.resources package is an exception. I'd be fine with that (or pretty much any other name - I'm not tied to any naming conventions). >> I'd like to complete these before I start the main refactoring to a) do >> things in stages b) do the bigger refactoring from a slightly cleaner start. >> >> The broader refactoring aims to provide aliases, overlays, resource JARs >> and anything else along those lines through a common interface with the >> implementations going directly to the file system. Access via URLs will >> also be supported but direct access to the file system will be >> preferred. > > How are you going to handle unpacked WARs ? > Some abstraction will still be needed. I wonder how much will it > differ from DirContext. Things will hopefully become a little clearer as I start to commit stuff but there will be separate implementations for File, Dir and Jar with possibly another three implementations for URL based access rather than Direct access (I want to wait until I see how similar the implementations are before I decide exactly how to handle that). WAR is essentially a special case (since it is the wrapper for all resources) that will use either Dir or Jar for it's 'main' resources. > DirContext served it purpose, but it looks that it requires too much > plumbing (dealing with Names etc). I wonder whether it can survive as > a facade to new API. (Though I do not yet know a valid purpose to keep > such facade). It is the plumbing I want to bypass. I think direct file (and probably URL) access will be simpler to maintain and hopefully faster. > org.apache.naming.* will survive, because Tomcat still needs JNDI support . Agreed. > URLs are needed per Servlet API, so they cannot be removed. Does our > "jndi" schema need DirContext as underlying implementation? Our jndi scheme was used to provide access to resources. I believe all of that will now go. > I noticed the following commit in archives: > http://svn.apache.org/viewvc?view=revision&revision=1137646 > so we have to deal with such schema combinations as "jar:jndi:". No we won't. We only hadf to deal with URLs like that because we generated them. > IIRC there was once a person who complained that our "jndi" schema was > clashing with some other implementation of "jndi" schema in an > application where he was trying to embed Tomcat. I cannot find that > thread in the archives though. I don't recall that but this will fix that minor issue too. > I wonder what will happen with org.apache.naming.JndiPermission > http://tomcat.apache.org/tomcat-7.0-doc/security-manager-howto.html#Tomcat_Custom_Permissions I think it just gets removed. >> I have some rough ideas for this. My plan is to commit the >> new classes as I go along so folks can comment and provide feedback but >> only commit the changes to existing classes once I have everything working. > > OK. > > Though if it is work in progress maybe some comments/summaries will be > needed to understand how it is going to be integrated with existing > code. I plan just to commit the new interfaces to start with and they will include lots of Javadoc. > Best regards, > Konstantin Kolinko Thanks for the feedback
Re: [Proposal] Preparatory refactoring for Resource handling refactoring
2012/6/16 Mark Thomas : > >> URLs are needed per Servlet API, so they cannot be removed. Does our >> "jndi" schema need DirContext as underlying implementation? > > Our jndi scheme was used to provide access to resources. I believe all > of that will now go. > >> I noticed the following commit in archives: >> http://svn.apache.org/viewvc?view=revision&revision=1137646 >> so we have to deal with such schema combinations as "jar:jndi:". > > No we won't. We only hadf to deal with URLs like that because we > generated them. > How are you going to implement ServletContext.getResource(String): URL without a custom URL scheme (be it named "jndi" or somehow else)? For file resources it might be possible to produce the "actual" URL pointing to a JAR entry or to a file (leaving aside the question of whether it exposes too much details), but you cannot do so with directories, as entries in a directory can be assembled from several sources. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Proposal] Preparatory refactoring for Resource handling refactoring
Konstantin Kolinko wrote: >2012/6/16 Mark Thomas : >> >>> URLs are needed per Servlet API, so they cannot be removed. Does our >>> "jndi" schema need DirContext as underlying implementation? >> >> Our jndi scheme was used to provide access to resources. I believe >all >> of that will now go. >> >>> I noticed the following commit in archives: >>> http://svn.apache.org/viewvc?view=revision&revision=1137646 >>> so we have to deal with such schema combinations as "jar:jndi:". >> >> No we won't. We only hadf to deal with URLs like that because we >> generated them. >> > >How are you going to implement >ServletContext.getResource(String): URL > >without a custom URL scheme (be it named "jndi" or somehow else)? > >For file resources it might be possible to produce the "actual" URL >pointing to a JAR entry or to a file (leaving aside the question of >whether it exposes too much details), but you cannot do so with >directories, as entries in a directory can be assembled from several >sources. My intention was to use the URL for the actual resource. For directories, I'll use the first matching dir I find although I need to re-read the spec and Javadoc to make sure there aren't any nasty surprises waiting to trip me up. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351010 - in /tomcat/trunk/webapps/examples/websocket: chat.html echo.html snake.html
Author: markt
Date: Sat Jun 16 21:36:19 2012
New Revision: 1351010
URL: http://svn.apache.org/viewvc?rev=1351010&view=rev
Log:
Fix the WebSocket examples so the work with secure as well as non-secure
connections.
Modified:
tomcat/trunk/webapps/examples/websocket/chat.html
tomcat/trunk/webapps/examples/websocket/echo.html
tomcat/trunk/webapps/examples/websocket/snake.html
Modified: tomcat/trunk/webapps/examples/websocket/chat.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/chat.html?rev=1351010&r1=1351009&r2=1351010&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/chat.html (original)
+++ tomcat/trunk/webapps/examples/websocket/chat.html Sat Jun 16 21:36:19 2012
@@ -77,7 +77,11 @@
});
Chat.initialize = function() {
-Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
+if (window.location.protocol == 'http:') {
+Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
+} else {
+ Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
+}
};
Chat.sendMessage = (function() {
Modified: tomcat/trunk/webapps/examples/websocket/echo.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/echo.html?rev=1351010&r1=1351009&r2=1351010&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/echo.html (original)
+++ tomcat/trunk/webapps/examples/websocket/echo.html Sat Jun 16 21:36:19 2012
@@ -104,7 +104,11 @@
}
function updateTarget(target) {
-document.getElementById('target').value = 'ws://' +
window.location.host + target;
+ if (window.location.protocol == 'http:') {
+ document.getElementById('target').value = 'ws://' +
window.location.host + target;
+ } else {
+ document.getElementById('target').value = 'wss://' +
window.location.host + target;
+ }
}
function log(message) {
Modified: tomcat/trunk/webapps/examples/websocket/snake.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/snake.html?rev=1351010&r1=1351009&r2=1351010&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/snake.html (original)
+++ tomcat/trunk/webapps/examples/websocket/snake.html Sat Jun 16 21:36:19 2012
@@ -109,7 +109,11 @@
}
}
}, false);
-Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
+if (window.location.protocol == 'http:') {
+Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
+} else {
+ Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
+}
};
Game.setDirection = function(direction) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351011 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/examples/websocket/chat.html webapps/examples/websocket/echo.html webapps/examples/websocket/snake.html
Author: markt
Date: Sat Jun 16 21:40:17 2012
New Revision: 1351011
URL: http://svn.apache.org/viewvc?rev=1351011&view=rev
Log:
Fix the WebSocket examples so the work with secure as well as non-secure
connections.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1351010
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=1351011&r1=1351010&r2=1351011&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jun 16 21:40:17 2012
@@ -55,10 +55,17 @@
-->
-
-Fix checking of recommended tcnative library version
-when using the APR connector. (rjung)
-
+
+ Fix checking of recommended tcnative library version when using the APR
+ connector. (rjung)
+
+
+
+
+ Update the WebSocket examples in the examples web application so that
they
+ work with secure connections (wss) as well as non-secure (ws)
connections.
+ (markt)
+
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html?rev=1351011&r1=1351010&r2=1351011&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html Sat Jun 16
21:40:17 2012
@@ -77,7 +77,11 @@
});
Chat.initialize = function() {
-Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
+if (window.location.protocol == 'http:') {
+Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
+} else {
+ Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
+}
};
Chat.sendMessage = (function() {
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html?rev=1351011&r1=1351010&r2=1351011&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html Sat Jun 16
21:40:17 2012
@@ -104,7 +104,11 @@
}
function updateTarget(target) {
-document.getElementById('target').value = 'ws://' +
window.location.host + target;
+ if (window.location.protocol == 'http:') {
+ document.getElementById('target').value = 'ws://' +
window.location.host + target;
+ } else {
+ document.getElementById('target').value = 'wss://' +
window.location.host + target;
+ }
}
function log(message) {
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html?rev=1351011&r1=1351010&r2=1351011&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html Sat Jun 16
21:40:17 2012
@@ -109,7 +109,11 @@
}
}
}, false);
-Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
+if (window.location.protocol == 'http:') {
+Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
+} else {
+ Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
+}
};
Game.setDirection = function(direction) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Proposal] Preparatory refactoring for Resource handling refactoring
On 16/06/2012 19:18, Mark Thomas wrote: > > > Konstantin Kolinko wrote: > >> 2012/6/16 Mark Thomas : >>> URLs are needed per Servlet API, so they cannot be removed. Does our "jndi" schema need DirContext as underlying implementation? >>> >>> Our jndi scheme was used to provide access to resources. I >>> believe >> all >>> of that will now go. >>> I noticed the following commit in archives: http://svn.apache.org/viewvc?view=revision&revision=1137646 so we have to deal with such schema combinations as "jar:jndi:". >>> >>> No we won't. We only hadf to deal with URLs like that because we >>> generated them. >>> >> >> How are you going to implement ServletContext.getResource(String): >> URL >> >> without a custom URL scheme (be it named "jndi" or somehow else)? >> >> For file resources it might be possible to produce the "actual" >> URL pointing to a JAR entry or to a file (leaving aside the >> question of whether it exposes too much details), but you cannot >> do so with directories, as entries in a directory can be assembled >> from several sources. > > My intention was to use the URL for the actual resource. For > directories, I'll use the first matching dir I find although I need > to re-read the spec and Javadoc to make sure there aren't any nasty > surprises waiting to trip me up. Having re-read the specification and Javadoc, I don't see anything of concern. Additional pairs of eyes wouldn't hurt though. How to handle getResource() for a directory that exists in one or more overlays and/or the main WAR is an interesting question. I'll be sure to raise it within the Servlet EG when we get back to that question. Cheers, Mark - 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/3093 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1351010 Blamelist: markt Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/681 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1351011 Blamelist: markt Build succeeded! sincerely, -The Buildbot
RE: Possible IIS SPDY Redirector for Tomcat
Hello all, > > -Original Message- > > From: Costin Manolache [mailto:cos...@gmail.com] > > Sent: Tuesday, May 29, 2012 9:09 AM > > > > Google servers (AFAIK) support both 2 and 3. > > > > I'm working on a 3 implementation for tomcat - the hard part is the > > flow > > control. The even harder part is finding time to work on it... > > Ok, thank you for your efforts! Recently I read on a thread in the Google SPDY forums that Jetty has now support for SPDY/3 in their latest 7.6.5 and 8.1.5 snapshots [1]. Therefore I tried to use the SPDY redirector to connect to Jetty, to see if it is working correctly :) Since I wrote the last E-Mail, I have done some changes to the SPDY redirector: - the IIS Module now supports redirecting requests which contain an entity body (e.g. POST requests), - Improved logging (esp. for the low-level SpdyConnector, so one can see which SPDY Frames are actually sent/received) - however I think current logging should probably replaced by frameworks like Apache log4net, - Fixed various bugs which I spotted during testing with Jetty. I had running Jetty, the Java NPN tunnel and IIS with the SPDY module on one virtual machine, and a browser on another PC. When I browsed to some simple HTML pages containing images etc., it seemed to me that the performance (answer time / page load time) was very good (HTTP client/Browser receives response nearly immediately after sending the request), whereas on previous testings with Google Servers (running Browser, IIS and Java NPN tunnel on the same virtual machine) performance was rather poor (it took several times longer until all images were loaded, as compared to accessing the Google Server directly) - I currently don't know the cause of this. I have also done some tests with Servlets that e.g. produce lots of data (and a slow consumer), to verify that Flow Control is working correctly in both directions. (However it seems that current Jetty version has some problems with SPDY - e.g. sometimes CPU usage of Jetty goes up to 100% and it doesn't respond on the SPDY connection any more.) I have committed the changes to the SVN repo which I'm using [2], so you can try the latest version with IIS 7.x/8.x, e.g. to connect to Jetty (according to the thread in Google Groups, it should be possible to set up Jetty's SPDY connector to not use TLS/NPN, so that you don't need a SSL certificate and the java NPN tunnel). I would be happy if you have some feedback :) Regards, Konstantin Preißer [1] https://groups.google.com/forum/?fromgroups#!topic/spdy-dev/and5OLY4AsI [2] https://kinderbasar-luhe.de:8543/svn/PreisserNormaleProjekte/SpdyConnector/.Net/SPDY-Redirector/ - 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.28
2012/6/15 Mark Thomas : > The proposed Apache Tomcat 7.0.28 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.28/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-243/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/ > > The proposed 7.0.27 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 7.0.28 Stable > Compiled and tested with JDK 6u33 32-bit on WinXP, x BIO, NIO, APR (1.1.24). Testsuite completed with single error for for BIO connector in org.apache.catalina.loader.TestWebappClassLoaderExecutorMemoryLeak [[[ Testcase: testTimerThreadLeak took 2,593 sec FAILED null junit.framework.AssertionFailedError: null at org.apache.catalina.loader.TestWebappClassLoaderExecutorMemoryLeak.testTimerThreadLeak(TestWebappClassLoaderExecutorMemoryLeak.java:72) ]]] I rerun this test and it failed for APR, but succeeded for NIO and BIO. So it is random. Warnings in the logs: the same as listed by Rainer. The "Incorrect connection count" warning (discussed 5 days ago) did not happen, so that issue appears to be fixed. Best regards, Konstantin Kolinko - 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-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 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-validate : 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-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 27 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/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-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/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-17062012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-17062012.jar:/srv/gump/public/workspace/junit/dist/junit-17062012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-17062012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-12.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-17062012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-17062012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-17062012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-17062012-dep.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2278 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/webapps/examples/websocket/chat.html:83:13: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/webapps/examples/websocket/echo.html:107:9: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/webapps/examples/websocket/snake.html:115:13: File contains tab characters (this is the first instance). BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:449: Got 3 errors and 0 warnings. Total time: 26 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1117062012, vmgump.apache.org:vmgump:1117062012 Gump E-mail Identifier (unique w
[GUMP@vmgump]: Project tomcat-trunk-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 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-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 28 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/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-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/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-17062012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-17062012.jar:/srv/gump/public/workspace/junit/dist/junit-17062012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-17062012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-12.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-17062012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-17062012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-17062012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-17062012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2281 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/examples/websocket/chat.html:83:13: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/examples/websocket/echo.html:107:9: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/examples/websocket/snake.html:115:13: File contains tab characters (this is the first instance). BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:460: Got 3 errors and 0 warnings. Total time: 28 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gum
svn commit: r1351054 - in /tomcat/trunk/webapps/examples/websocket: chat.html echo.html snake.html
Author: kkolinko
Date: Sun Jun 17 06:04:46 2012
New Revision: 1351054
URL: http://svn.apache.org/viewvc?rev=1351054&view=rev
Log:
tabs -> spaces, as reminded by Checkstyle
Modified:
tomcat/trunk/webapps/examples/websocket/chat.html
tomcat/trunk/webapps/examples/websocket/echo.html
tomcat/trunk/webapps/examples/websocket/snake.html
Modified: tomcat/trunk/webapps/examples/websocket/chat.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/chat.html?rev=1351054&r1=1351053&r2=1351054&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/chat.html (original)
+++ tomcat/trunk/webapps/examples/websocket/chat.html Sun Jun 17 06:04:46 2012
@@ -80,7 +80,7 @@
if (window.location.protocol == 'http:') {
Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
} else {
- Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
+Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
}
};
Modified: tomcat/trunk/webapps/examples/websocket/echo.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/echo.html?rev=1351054&r1=1351053&r2=1351054&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/echo.html (original)
+++ tomcat/trunk/webapps/examples/websocket/echo.html Sun Jun 17 06:04:46 2012
@@ -104,11 +104,11 @@
}
function updateTarget(target) {
- if (window.location.protocol == 'http:') {
- document.getElementById('target').value = 'ws://' +
window.location.host + target;
- } else {
- document.getElementById('target').value = 'wss://' +
window.location.host + target;
- }
+if (window.location.protocol == 'http:') {
+document.getElementById('target').value = 'ws://' +
window.location.host + target;
+} else {
+document.getElementById('target').value = 'wss://' +
window.location.host + target;
+}
}
function log(message) {
Modified: tomcat/trunk/webapps/examples/websocket/snake.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/snake.html?rev=1351054&r1=1351053&r2=1351054&view=diff
==
--- tomcat/trunk/webapps/examples/websocket/snake.html (original)
+++ tomcat/trunk/webapps/examples/websocket/snake.html Sun Jun 17 06:04:46 2012
@@ -112,7 +112,7 @@
if (window.location.protocol == 'http:') {
Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
} else {
- Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
+Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
}
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351055 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/websocket/chat.html webapps/examples/websocket/echo.html webapps/examples/websocket/snake.html
Author: kkolinko
Date: Sun Jun 17 06:08:36 2012
New Revision: 1351055
URL: http://svn.apache.org/viewvc?rev=1351055&view=rev
Log:
Merged revision 1351054 from tomcat/trunk:
tabs -> spaces, as reminded by Checkstyle
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1351054
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html?rev=1351055&r1=1351054&r2=1351055&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html Sun Jun 17
06:08:36 2012
@@ -80,7 +80,7 @@
if (window.location.protocol == 'http:') {
Chat.connect('ws://' + window.location.host +
'/examples/websocket/chat');
} else {
- Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
+Chat.connect('wss://' + window.location.host +
'/examples/websocket/chat');
}
};
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html?rev=1351055&r1=1351054&r2=1351055&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html Sun Jun 17
06:08:36 2012
@@ -104,11 +104,11 @@
}
function updateTarget(target) {
- if (window.location.protocol == 'http:') {
- document.getElementById('target').value = 'ws://' +
window.location.host + target;
- } else {
- document.getElementById('target').value = 'wss://' +
window.location.host + target;
- }
+if (window.location.protocol == 'http:') {
+document.getElementById('target').value = 'ws://' +
window.location.host + target;
+} else {
+document.getElementById('target').value = 'wss://' +
window.location.host + target;
+}
}
function log(message) {
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html?rev=1351055&r1=1351054&r2=1351055&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html Sun Jun 17
06:08:36 2012
@@ -112,7 +112,7 @@
if (window.location.protocol == 'http:') {
Game.connect('ws://' + window.location.host +
'/examples/websocket/snake');
} else {
- Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
+Game.connect('wss://' + window.location.host +
'/examples/websocket/snake');
}
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351056 - in /tomcat/trunk/webapps/examples/jsp/jsp2/jspx: svgexample.html textRotate.jspx
Author: kkolinko Date: Sun Jun 17 06:14:37 2012 New Revision: 1351056 URL: http://svn.apache.org/viewvc?rev=1351056&view=rev Log: Correct reference to Apache Batik project It now lives in xmlgraphics.apache.org. Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1351056&r1=1351055&r2=1351056&view=diff == --- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html (original) +++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Sun Jun 17 06:14:37 2012 @@ -33,7 +33,7 @@ To execute this example, follow these steps: - Download http://xml.apache.org/batik/index.html";>Batik, + Download http://xmlgraphics.apache.org/batik/index.html";>Apache Batik, or any other SVG viewer. Copy the following URL: http://localhost:8080/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX";> Modified: tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx?rev=1351056&r1=1351055&r2=1351056&view=diff == --- tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx (original) +++ tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Sun Jun 17 06:14:37 2012 @@ -16,7 +16,7 @@ --> http://www.w3.org/2000/svg"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351057 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/jsp/jsp2/jspx/svgexample.html webapps/examples/jsp/jsp2/jspx/textRotate.jspx
Author: kkolinko Date: Sun Jun 17 06:16:55 2012 New Revision: 1351057 URL: http://svn.apache.org/viewvc?rev=1351057&view=rev Log: Merged revision 1351056 from tomcat/trunk: Correct reference to Apache Batik project It now lives in xmlgraphics.apache.org. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1351056 Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1351057&r1=1351056&r2=1351057&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Sun Jun 17 06:16:55 2012 @@ -33,7 +33,7 @@ To execute this example, follow these steps: - Download http://xml.apache.org/batik/index.html";>Batik, + Download http://xmlgraphics.apache.org/batik/index.html";>Apache Batik, or any other SVG viewer. Copy the following URL: http://localhost:8080/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX";> Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx?rev=1351057&r1=1351056&r2=1351057&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Sun Jun 17 06:16:55 2012 @@ -16,7 +16,7 @@ --> http://www.w3.org/2000/svg"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351058 - in /tomcat/tc6.0.x/trunk: ./ webapps/examples/jsp/jsp2/jspx/svgexample.html webapps/examples/jsp/jsp2/jspx/textRotate.jspx
Author: kkolinko Date: Sun Jun 17 06:19:53 2012 New Revision: 1351058 URL: http://svn.apache.org/viewvc?rev=1351058&view=rev Log: CTR Merged revision 1351056 from tomcat/trunk: Correct reference to Apache Batik project in SVG generation example It now lives in xmlgraphics.apache.org. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1351056 Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1351058&r1=1351057&r2=1351058&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Sun Jun 17 06:19:53 2012 @@ -33,7 +33,7 @@ To execute this example, follow these steps: - Download http://xml.apache.org/batik/index.html";>Batik, + Download http://xmlgraphics.apache.org/batik/index.html";>Apache Batik, or any other SVG viewer. Copy the following URL: http://localhost:8080/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX";> Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx?rev=1351058&r1=1351057&r2=1351058&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx Sun Jun 17 06:19:53 2012 @@ -16,7 +16,7 @@ --> http://www.w3.org/2000/svg"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351059 - in /tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx: svgexample.html textRotate.jspx
Author: kkolinko Date: Sun Jun 17 06:24:34 2012 New Revision: 1351059 URL: http://svn.apache.org/viewvc?rev=1351059&view=rev Log: CTR Correct reference to Apache Batik project in SVG generation example It now lives in xmlgraphics.apache.org. It is backport of r1351056 from trunk. Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/svgexample.html tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/textRotate.jspx Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/svgexample.html URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/svgexample.html?rev=1351059&r1=1351058&r2=1351059&view=diff == --- tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/svgexample.html (original) +++ tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/svgexample.html Sun Jun 17 06:24:34 2012 @@ -33,7 +33,7 @@ To execute this example, follow these steps: - Download http://xml.apache.org/batik/index.html";>Batik, + Download http://xmlgraphics.apache.org/batik/index.html";>Apache Batik, or any other SVG viewer. Copy the following URL: http://localhost:8080/jsp-examples/jsp2/jspx/textRotate.jspx?name=JSPX";> Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/textRotate.jspx URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/textRotate.jspx?rev=1351059&r1=1351058&r2=1351059&view=diff == --- tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/textRotate.jspx (original) +++ tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/jsp2/jspx/textRotate.jspx Sun Jun 17 06:24:34 2012 @@ -16,7 +16,7 @@ --> http://www.w3.org/2000/svg"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
