Re: Manager look and feel

2013-08-27 Thread Mark Thomas
On 26/08/2013 23:00, Caldarale, Charles R wrote:
 From: Larry Shatzer, Jr. [mailto:lar...@gmail.com] Subject: Re:
 Manager look and feel
 
 Maybe switching the manager application to use JSP for all
 presentation
 
 I don't think that should be done.  Some sites may disable JSP
 capability, but still want to use the manager webapp.

My instant reaction was +1. On reflection, the Manager does use JSP
already for some aspects and no-one has complained to date. On that
basis I have no objections to making greater use of JSPs.

The current approach does support i18n and any switch to JSP would need
to continue to do so to at least the same degree.

The fall-back for sites that didn't want JSPs but wanted to use the
manager would be to use the text based interface.

 I suppose one
 could pre-compile the JSP code, but that makes it harder for a site
 to customize the manager.
 
 - Chuck

There is also work in progress to improve the docs and the Tomcat
website. It would be preferable if there was a consistent look and feel
between those and the manager app.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Need a tc-native 1.1.28 release

2013-08-27 Thread Mark Thomas
On 27/08/2013 04:07, Violeta Georgieva wrote:
 2013/8/23 Mark Thomas wrote:

 Tomcat 8 needs tc-native with the fix for non-blocking IO [1]. Any
 takers for rolling the release?
 
 Mark,
 
 Do we need this for Tomcat 7 as well?

Yes. It affects the JSR-356 WebSocket implementation.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51872

zhaoti 396081...@qq.com changed:

   What|Removed |Added

  Component|Connectors  |Connectors
Version|7.0.20  |6.0.35
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default
 OS|Linux   |Windows Server 2003

-- 
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 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51872

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

  Component|Connectors  |Connectors
Version|6.0.35  |7.0.20
Product|Tomcat 6|Tomcat 7
   Target Milestone|default |---
 OS|Windows Server 2003 |Linux

-- 
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



Re: [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

2013-08-27 Thread Mark Thomas
On 27/08/2013 09:26, bugzi...@apache.org wrote:
 https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
 
 zhaoti 396081...@qq.com changed:
 
What|Removed |Added
 
   Component|Connectors  |Connectors
 Version|7.0.20  |6.0.35
 Product|Tomcat 7|Tomcat 6
Target Milestone|--- |default
  OS|Linux   |Windows Server 2003
 


I've reverted these changes and blocked the idiot's Bugzilla account.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55479] JSR 196 (JASPIC) support in Tomcat

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55479

Violeta Georgieva violet...@apache.org changed:

   What|Removed |Added

   Severity|normal  |enhancement

-- 
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



Investigating failing Tomcat trunk unit test

2013-08-27 Thread Mark Thomas
Hi,

I've been unable to re-create the current Tomcat trunk unit test failure
observed by Gump. Therefore, I'd like to request ssh access to vmgump in
order to be able to run the unit test in the same environment, hopefully
recreate the problem and fix it.

Looking at the infrastructure repo, I should have ssh access to vmgump.
However, it looks like this has been lost / disabled at some point. I'd
be grateful if this could be recreated/enabled.

Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #10 from Mark Thomas ma...@apache.org ---
I like it! It is a big improvement on what we have at the moment.

I have your latest patch applied locally after fixing a few minor niggles
(trailing whitespace) with the patch.

The only issue I can see at the moment is that the Tomcat logo doesn't show up.
I'm inclined to commit this patch just as soon as I have fixed the logo issue.

My current view is that once we are happy with this for 8.0.x (I'm pretty much
there - I can't speak for the other committers) we apply similar changes to
7.0.x, 6.0.x and the main Tomcat site (all are built with essentially the same
mechanism).

-- 
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



Re: Need a tc-native 1.1.28 release

2013-08-27 Thread jean-frederic clere

On 08/27/2013 10:00 AM, Mark Thomas wrote:

On 27/08/2013 04:07, Violeta Georgieva wrote:

2013/8/23 Mark Thomas wrote:


Tomcat 8 needs tc-native with the fix for non-blocking IO [1]. Any
takers for rolling the release?


Mark,

Do we need this for Tomcat 7 as well?


Yes. It affects the JSR-356 WebSocket implementation.


Mladen or I should be able to do that next week.

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #11 from Mark Thomas ma...@apache.org ---
Figured out the logo issue. I missed the new logo you attached.

I renamed it to tomcat.png - no need for the new bit.

-- 
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



Re: Investigating failing Tomcat trunk unit test

2013-08-27 Thread Stefan Bodewig
On 2013-08-27, Mark Thomas wrote:

 Looking at the infrastructure repo, I should have ssh access to vmgump.
 However, it looks like this has been lost / disabled at some point. I'd
 be grateful if this could be recreated/enabled.

Right now I'm without my SSH key to log in to vmgump and will be
travelling the next days - not sure whether I'll find time to do so
tonight.

Bill Barker should have the necessary permissions to help out IIRC.

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #12 from Mark Thomas ma...@apache.org ---
Patches applied to 8.0.x.

I'm leaving this open for further improvements to 8.0.x as well as possible
back-port to 7.0.x, 6.0.x and the website.

-- 
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: r1517778 - in /tomcat/trunk: build.xml webapps/docs/images/docs-stylesheet.css webapps/docs/images/tomcat.png webapps/docs/tomcat-docs.xsl

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 10:18:08 2013
New Revision: 1517778

URL: http://svn.apache.org/r1517778
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383
Improve markup and design of the Tomcat 8 documentation webapp.
Patch provided by Konstantin Preißer.

Added:
tomcat/trunk/webapps/docs/images/docs-stylesheet.css   (with props)
tomcat/trunk/webapps/docs/images/tomcat.png   (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/tomcat-docs.xsl

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1517778r1=151r2=1517778view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Aug 27 10:18:08 2013
@@ -210,6 +210,7 @@
   tstamp
 format property=year pattern= locale=en/
 format property=today pattern=MMM d  locale=en/
+format property=today-iso-8601 pattern=-MM-dd locale=en/
 format property=tstamp pattern=hh:mm:ss/
   /tstamp
   filterset id=version.filters
@@ -845,6 +846,7 @@
   param name=relative-path expression=./
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
 xslt basedir=webapps/docs/appdev
@@ -859,6 +861,7 @@
   param name=relative-path expression=../
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
 xslt basedir=webapps/docs/funcspecs
@@ -873,6 +876,7 @@
   param name=relative-path expression=../
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
 xslt basedir=webapps/docs/config
@@ -887,6 +891,7 @@
   param name=relative-path expression=../
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
 xslt basedir=webapps/docs/architecture
@@ -901,6 +906,7 @@
   param name=relative-path expression=../
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
 
@@ -916,6 +922,7 @@
   param name=relative-path expression=../
   param name=version expression=${version}/
   param name=build-date expression=${today}/
+  param name=build-date-iso-8601 expression=${today-iso-8601}/
   param name=year expression=${year}/
 /xslt
   /target

Added: tomcat/trunk/webapps/docs/images/docs-stylesheet.css
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/docs-stylesheet.css?rev=1517778view=auto
==
--- tomcat/trunk/webapps/docs/images/docs-stylesheet.css (added)
+++ tomcat/trunk/webapps/docs/images/docs-stylesheet.css Tue Aug 27 10:18:08 
2013
@@ -0,0 +1,260 @@
+@charset utf-8;
+/*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the License); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an AS IS BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+
+/* General style */
+
+body {
+  margin: 0;
+}
+
+body, input {
+  font-family: 'Lucida Sans Unicode', Arial, Helvetica, sans-serif;
+  font-size: 10.5pt;
+}
+
+code, pre {
+  font-family: Consolas, monospace;
+}
+
+img {
+  border: 0;
+}
+
+table {
+  border-collapse: collapse;
+}
+
+main {
+  /* Remove this once all IEs support main element */
+  display: block;
+}
+
+
+/* Layout */
+
+#wrapper {
+  min-width: 400px;
+}
+
+#header {
+  box-shadow: 0 0 7px #aaa;
+  border-bottom: 1px solid #bbb;
+}
+
+#header  div {
+  padding-left: 15px;
+  padding-right: 15px;
+  background: linear-gradient(to bottom, #ff -10%, #F8F3E4 100%);
+  position: relative;
+}
+
+#header .logo {
+  float: left;
+  padding-top: 10px;
+  min-width: 190px;
+}
+
+#header .logo  img{

svn commit: r1517791 - /tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 11:28:27 2013
New Revision: 1517791

URL: http://svn.apache.org/r1517791
Log:
Add a unit test for chunked encoding

Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1517791r1=1517790r2=1517791view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java 
Tue Aug 27 11:28:27 2013
@@ -60,7 +60,7 @@ public class TestAbstractHttp11Processor
 Content-Length: 9 + SimpleHttpClient.CRLF +
 Content-Type: application/x-www-form-urlencoded +
 SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
 test=data;
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
@@ -71,6 +71,7 @@ public class TestAbstractHttp11Processor
 assertTrue(client.isResponse501());
 }
 
+
 @Test
 public void testWithTEBuffered() throws Exception {
 Tomcat tomcat = getTomcatInstance();
@@ -88,7 +89,7 @@ public class TestAbstractHttp11Processor
 Content-Length: 9 + SimpleHttpClient.CRLF +
 Content-Type: application/x-www-form-urlencoded +
 SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
 test=data;
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
@@ -101,6 +102,39 @@ public class TestAbstractHttp11Processor
 
 
 @Test
+public void testWithTEChunked() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Use the normal Tomcat ROOT context
+File root = new File(test/webapp);
+tomcat.addWebapp(, root.getAbsolutePath());
+
+tomcat.start();
+
+String request =
+POST /echo-params.jsp HTTP/1.1 + SimpleHttpClient.CRLF +
+Host: any + SimpleHttpClient.CRLF +
+Transfer-encoding: chunked + SimpleHttpClient.CRLF +
+Content-Type: application/x-www-form-urlencoded +
+SimpleHttpClient.CRLF +
+Connection: close + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+9 + SimpleHttpClient.CRLF +
+test=data + SimpleHttpClient.CRLF +
+0 + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF;
+
+Client client = new Client(tomcat.getConnector().getLocalPort());
+client.setRequest(new String[] {request});
+
+client.connect();
+client.processRequest();
+assertTrue(client.isResponse200());
+assertTrue(client.getResponseBody().contains(test - data));
+}
+
+
+@Test
 public void testWithTEIdentity() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
@@ -118,7 +152,7 @@ public class TestAbstractHttp11Processor
 Content-Type: application/x-www-form-urlencoded +
 SimpleHttpClient.CRLF +
 Connection: close + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
 test=data;
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
@@ -148,7 +182,7 @@ public class TestAbstractHttp11Processor
 Content-Length: 9 + SimpleHttpClient.CRLF +
 Content-Type: application/x-www-form-urlencoded +
 SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
 test=data;
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
@@ -177,7 +211,7 @@ public class TestAbstractHttp11Processor
 Content-Length: 9 + SimpleHttpClient.CRLF +
 Content-Type: application/x-www-form-urlencoded +
 SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
 test=data;
 
 Client client = new Client(tomcat.getConnector().getLocalPort());



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #13 from Konstantin Preißer prei...@web.de ---
Hi Mark,
(In reply to Mark Thomas from comment #12)
 Patches applied to 8.0.x.
 
 I'm leaving this open for further improvements to 8.0.x as well as possible
 back-port to 7.0.x, 6.0.x and the website.

Great!

Note, for the documentation there are still some things to do in the various
XML files (like using #One_Two_Three fragment identifiers instead of wrong
#One Two Three (another correct way would be #One%20Two%20Three, but the
XSLT replaces   with _ which also looks better), replacing hard-coded HTML
presentational elements/attributes with CSS, and so on.

I will work on these things, (I just wanted to wait on someone reviewing the
XSLT before I go on).

-- 
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



[Tomcat Wiki] Update of ContributorsGroup by markt

2013-08-27 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The ContributorsGroup page has been changed by markt:
https://wiki.apache.org/tomcat/ContributorsGroup?action=diffrev1=8rev2=9

   * LucaVisconti
   * NevenCvetkovic
   * ShawnYu
+  * DmytroMrachkovskyi
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55477] Add a solution to map an realm name to a security role

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55477

--- Comment #3 from Christopher Schultz ch...@christopherschultz.net ---
Yeah, you can access sub-elements (we use Digester, so it just needs to be
configured, but I'd prefer not to modify the digester configuration if it's not
necessary).

I was a little worried about the delimiter stuff, and no, there aren't any
rules against what a security role's name could be. I wanted to avoid commas
because obviously LDAP group names are littered with commas. The map would be a
nicer way to go. We could look to see if there's anything already recognized
under Realm that could be used, here, or if something new is more
appropriate.

-- 
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 54085] ssl_socket_recv sometimes loops infinitely with non-blocking sockets

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54085

--- Comment #1 from Christopher Schultz ch...@christopherschultz.net ---
Possibly fixed by http://svn.apache.org/viewvc?view=revisionrevision=1490001

-- 
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: r1517865 - in /tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig: ConnectorStoreAppender.java IDynamicPropertyStoreAppender.java StoreAppender.java

2013-08-27 Thread jfclere
Author: jfclere
Date: Tue Aug 27 16:12:15 2013
New Revision: 1517865

URL: http://svn.apache.org/r1517865
Log:
Make sure that null doesn't get insert in server.xml.

Modified:

tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java

tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java

tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java

Modified: 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1517865r1=1517864r2=1517865view=diff
==
--- 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
 (original)
+++ 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
 Tue Aug 27 16:12:15 2013
@@ -103,6 +103,9 @@ public class ConnectorStoreAppender exte
 if (value == null) {
 continue; // Null values are not persisted
 }
+if (value.equals(null)) {
+   continue; // null values are not persisted
+}
 // Convert IP addresses to strings so they will be persisted
 if (value instanceof InetAddress) {
 value = ((InetAddress) value).getHostAddress();
@@ -295,4 +298,4 @@ public class ConnectorStoreAppender exte
 return (jkHomeBase);
 }
 
-}
\ No newline at end of file
+}

Modified: 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java?rev=1517865r1=1517864r2=1517865view=diff
==
--- 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
 (original)
+++ 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
 Tue Aug 27 16:12:15 2013
@@ -78,6 +78,9 @@ public class IDynamicPropertyStoreAppend
 if (value == null) {
 continue; // Null values are not persisted
 }
+if (value.equals(null)) {
+continue; // null values are not persisted
+}
 if (!isPersistable(value.getClass())) {
 continue;
 }
@@ -131,4 +134,4 @@ public class IDynamicPropertyStoreAppend
 return propertyKeys;
 }
 
-}
\ No newline at end of file
+}

Modified: 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1517865r1=1517864r2=1517865view=diff
==
--- 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
 (original)
+++ 
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
 Tue Aug 27 16:12:15 2013
@@ -243,6 +243,9 @@ public class StoreAppender {
 if (value == null) {
 continue; // Null values are not persisted
 }
+if (value.equals(null)) {
+   continue; // null values are not persisted
+}
 Object value2 = IntrospectionUtils.getProperty(bean2,
 descriptors[i].getName());
 if (value.equals(value2)) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1517898 - in /tomcat/trunk/test/org/apache/coyote/ajp: SimpleAjpClient.java TestAbstractAjpProcessor.java TesterAjpMessage.java

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 17:59:56 2013
New Revision: 1517898

URL: http://svn.apache.org/r1517898
Log:
Extend the AJP test client to support methods other than GET and implement a 
simple POST test.

Modified:
tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java

Modified: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1517898r1=1517897r2=1517898view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Tue Aug 27 
17:59:56 2013
@@ -67,6 +67,11 @@ public class SimpleAjpClient {
  * Create a message to request the given URL.
  */
 public TesterAjpMessage createForwardMessage(String url) {
+return createForwardMessage(url, 2);
+}
+
+public TesterAjpMessage createForwardMessage(String url, int method) {
+
 TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
 message.reset();
 
@@ -78,7 +83,7 @@ public class SimpleAjpClient {
 message.appendByte(Constants.JK_AJP13_FORWARD_REQUEST);
 
 // HTTP method, GET = 2
-message.appendByte(0x02);
+message.appendByte(method);
 
 // Protocol
 message.appendString(http);
@@ -101,26 +106,44 @@ public class SimpleAjpClient {
 // Is ssl
 message.appendByte(0x00);
 
-// No other headers or attributes
-message.appendInt(0);
+return message;
+}
 
-// Terminator
-message.appendByte(0xFF);
 
-// End the message and set the length
+public TesterAjpMessage createBodyMessage(byte[] data) {
+
+TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
+message.reset();
+
+// Set the header bytes
+message.getBuffer()[0] = 0x12;
+message.getBuffer()[1] = 0x34;
+
+message.appendBytes(data, 0, data.length);
 message.end();
 
 return message;
 }
 
+
 /**
  * Sends an TesterAjpMessage to the server and returns the response 
message.
  */
-public TesterAjpMessage sendMessage(TesterAjpMessage message)
+public TesterAjpMessage sendMessage(TesterAjpMessage headers)
 throws IOException {
-// Send the message
+return sendMessage(headers, null);
+}
+
+public TesterAjpMessage sendMessage(TesterAjpMessage headers,
+TesterAjpMessage body) throws IOException {
+// Send the headers
 socket.getOutputStream().write(
-message.getBuffer(), 0, message.getLen());
+headers.getBuffer(), 0, headers.getLen());
+if (body != null) {
+// Send the body of present
+socket.getOutputStream().write(
+body.getBuffer(), 0, body.getLen());
+}
 // Read the response
 return readMessage();
 }

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1517898r1=1517897r2=1517898view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Tue 
Aug 27 17:59:56 2013
@@ -16,11 +16,12 @@
  */
 package org.apache.coyote.ajp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import java.io.File;
 
+import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 
@@ -56,8 +57,7 @@ public class TestAbstractAjpProcessor ex
 tomcat.start();
 
 // Must have a real docBase - just use temp
-org.apache.catalina.Context ctx =
-tomcat.addContext(, System.getProperty(java.io.tmpdir));
+Context ctx = tomcat.addContext(, 
System.getProperty(java.io.tmpdir));
 Tomcat.addServlet(ctx, helloWorld, new HelloWorldServlet());
 ctx.addServletMapping(/, helloWorld);
 
@@ -70,6 +70,8 @@ public class TestAbstractAjpProcessor ex
 validateCpong(ajpClient.cping());
 
 TesterAjpMessage forwardMessage = ajpClient.createForwardMessage(/);
+// Complete the message - no extra headers required.
+forwardMessage.end();
 
 // Two requests
 for (int i = 0; i  2; i++) {
@@ -90,6 +92,51 @@ public class TestAbstractAjpProcessor ex
 ajpClient.disconnect();
 }
 
+
+
+@Test
+public void testSimplePost() 

svn commit: r1517941 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java

2013-08-27 Thread violetagg
Author: violetagg
Date: Tue Aug 27 19:22:47 2013
New Revision: 1517941

URL: http://svn.apache.org/r1517941
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51526
o.a.catalina.startup.Tomcat.addWebapp(...) will process web application's 
context.xml when it is presented in the provided baseDir.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1517941r1=1517940r2=1517941view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Aug 27 
19:22:47 2013
@@ -18,12 +18,16 @@ package org.apache.catalina.startup;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -181,8 +185,8 @@ public class Tomcat {
 /**
  * This is equivalent to adding a web application to Tomcatapos;s webapps
  * directory. The equivalent of the default web.xml will be applied  to the
- * web application and any WEB-INF/web.xml packaged with the application
- * will be processed normally. Normal web fragment and
+ * web application and any WEB-INF/web.xml and META-INF/context.xml 
packaged
+ * with the application will be processed normally. Normal web fragment and
  * {@link javax.servlet.ServletContainerInitializer} processing will be
  * applied.
  *
@@ -525,6 +529,7 @@ public class Tomcat {
 ctx.setPath(url);
 ctx.setDocBase(path);
 ctx.addLifecycleListener(new DefaultWebXmlListener());
+ctx.setConfigFile(getWebappConfigFile(path, url));
 
 ContextConfig ctxCfg = new ContextConfig();
 ctx.addLifecycleListener(ctxCfg);
@@ -668,16 +673,20 @@ public class Tomcat {
 }
 
 private void silence(Host host, String ctx) {
-String base = org.apache.catalina.core.ContainerBase.[default].[;
+Logger.getLogger(getLoggerName(host, ctx)).setLevel(Level.WARNING);
+}
+
+private String getLoggerName(Host host, String ctx) {
+String loggerName = 
org.apache.catalina.core.ContainerBase.[default].[;
 if (host == null) {
-base += getHost().getName();
+loggerName += getHost().getName();
 } else {
-base += host.getName();
+loggerName += host.getName();
 }
-base += ].[;
-base += ctx;
-base += ];
-Logger.getLogger(base).setLevel(Level.WARNING);
+loggerName += ].[;
+loggerName += ctx;
+loggerName += ];
+return loggerName;
 }
 
 /**
@@ -1059,4 +1068,52 @@ public class Tomcat {
 z, application/x-compress,
 zip, application/zip
 };
+
+protected URL getWebappConfigFile(String path, String url) {
+File docBase = new File(path);
+if (docBase.isDirectory()) {
+return getWebappConfigFileFromDirectory(docBase, url);
+} else {
+return getWebappConfigFileFromJar(docBase, url);
+}
+}
+
+private URL getWebappConfigFileFromDirectory(File docBase, String url) {
+URL result = null;
+File webAppContextXml = new File(docBase, 
Constants.ApplicationContextXml);
+if (webAppContextXml.exists()) {
+try {
+result = webAppContextXml.toURI().toURL();
+} catch (MalformedURLException e) {
+Logger.getLogger(getLoggerName(getHost(), 
url)).log(Level.WARNING,
+Unable to determine web application context.xml  + 
docBase, e);
+}
+}
+return result;
+}
+
+private URL getWebappConfigFileFromJar(File docBase, String url) {
+URL result = null;
+JarFile jar = null;
+try {
+jar = new JarFile(docBase);
+JarEntry entry = jar.getJarEntry(Constants.ApplicationContextXml);
+if (entry != null) {
+result = new URL(jar: + docBase.toURI().toString() + !/
++ Constants.ApplicationContextXml);
+}
+} catch (IOException e) {
+Logger.getLogger(getLoggerName(getHost(), url)).log(Level.WARNING,
+Unable to determine web application context.xml  + 
docBase, e);
+} finally {
+if (jar != null) {
+try {
+jar.close();
+} catch 

[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #14 from Konstantin Preißer prei...@web.de ---
Hi,

I noticed that when viewing the doc XML source files from SVN over HTTP, like
changlog.xml:
  http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
then the CSS is not applied. Firefox logs an error about wrong MIME type
(text/plain instead of text/css).

This is probably because I forgot to set the correct MIME type on the .css
stylesheet. I think the following change should fix it:

Index: webapps/docs/images/docs-stylesheet.css
===
--- webapps/docs/images/docs-stylesheet.css(revision 1517925)
+++ webapps/docs/images/docs-stylesheet.css(working copy)

Property changes on: webapps/docs/images/docs-stylesheet.css
___
Added: svn:mime-type
## -0,0 +1 ##
+text/css
\ No newline at end of property



BTW, what do you think about switching from HTML to XHTML for the docs of
Tomcat 8 (or next major release)?
I mean:
  - change method attribute on the XSLT from html to xml
  - change file extension of generated output from .html to .xhtml
  - change output MIME type from text/html to application/xhtml+xml

Comparing XHTML over HTML for XSLT-generated content, I currently see the
following points:

Pro:
  - The XSLT processor does not need to know how specific HTML elements
should be outout.
For example, wbr is a void element in HTML5, but currently
the XSLT processor used by Ant/Java outputs wbr/wbr, which is wrong,
as the XSLT processor does not yet implement the current XSLT and XQuery
Serialization 3.0 spec [1].
However, when using XHTML, the browser also uses a XML parser and
therefore XML Syntax can be used (both wbr / or wbr/wbr would be
correct). This avoids the need for the XSLT processor to know how
specific elements should be output (this also concerns elements like
style and script which are output as CDATA in HTML).
  - One does not have to use the about:legacy-compat DOCTYPE (as
work-around until the XSLT processor supports the XLST 3 spec), because
in XHTML there is only Full Standards Mode.
Also, the old-style meta element which includes the encoding in a
Content-Type declaration is not needed.

Contra:
  - IE 9 (released: March 2011; IE 11 will be released soon) is the first IE
to support XHTML, while all other supported browsers like Firefox, Chrome,
Opera etc. support XHTML. IE 8 users will get a download dialog instead
of the page displayed.

Neutral:
  - Because the input (XML files and the XSLT file) is already XML and the
output will be automatically generated, the output syntax
(HTML or XHTML) is not of a concern when editing the source XML files.


However, because the file extension would change from .html to .xhtml, such a
step can probably only be done at a new major release as otherwise existing
links to the pages would stop working.

Using XHTML means that people which use IE 8 or older cannot view the pages.
However, one could think that folks with old browsers stay with old Tomcat
versions, and folks which use the newest Tomcat 8 also use a current IE.  :D


[1]  http://www.w3.org/TR/xslt-xquery-serialization-30/#HTML_DOCTYPE

-- 
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: r1517970 - in /tomcat/trunk/java/org/apache/coyote: Request.java ajp/AbstractAjpProcessor.java

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 20:18:10 2013
New Revision: 1517970

URL: http://svn.apache.org/r1517970
Log:
Content length is managed internally as a long. Fix a few places that were 
unnecessarily restricting it to an int.

Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1517970r1=1517969r2=1517970view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Tue Aug 27 20:18:10 2013
@@ -296,7 +296,7 @@ public final class Request {
 }
 
 
-public void setContentLength(int len) {
+public void setContentLength(long len) {
 this.contentLength = len;
 }
 

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1517970r1=1517969r2=1517970view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Aug 
27 20:18:10 2013
@@ -688,9 +688,7 @@ public abstract class AbstractAjpProcess
 if (hId == Constants.SC_REQ_CONTENT_LENGTH ||
 (hId == -1  tmpMB.equalsIgnoreCase(Content-Length))) {
 // just read the content-length header, so set it
-long cl = vMB.getLong();
-if(cl  Integer.MAX_VALUE)
-request.setContentLength( (int)cl );
+request.setContentLength(vMB.getLong());
 } else if (hId == Constants.SC_REQ_CONTENT_TYPE ||
 (hId == -1  tmpMB.equalsIgnoreCase(Content-Type))) {
 // just read the content-type header, so set it



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1517973 - /tomcat/trunk/webapps/docs/images/docs-stylesheet.css

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 20:37:17 2013
New Revision: 1517973

URL: http://svn.apache.org/r1517973
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383
Set the mime-type to prevent an error when viewing the changelog directly.

Modified:
tomcat/trunk/webapps/docs/images/docs-stylesheet.css   (props changed)

Propchange: tomcat/trunk/webapps/docs/images/docs-stylesheet.css
--
svn:mime-type = text/css



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #15 from Mark Thomas ma...@apache.org ---
(In reply to Konstantin Preißer from comment #14)
 Hi,
 
 I noticed that when viewing the doc XML source files from SVN over HTTP,
 like changlog.xml:
   http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
 then the CSS is not applied. Firefox logs an error about wrong MIME type
 (text/plain instead of text/css).
 
 This is probably because I forgot to set the correct MIME type on the .css
 stylesheet. I think the following change should fix it:
 
 Index: webapps/docs/images/docs-stylesheet.css
 ===
 --- webapps/docs/images/docs-stylesheet.css   (revision 1517925)
 +++ webapps/docs/images/docs-stylesheet.css   (working copy)
 
 Property changes on: webapps/docs/images/docs-stylesheet.css
 ___
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/css
 \ No newline at end of property

Fixed.

 BTW, what do you think about switching from HTML to XHTML for the docs of
 Tomcat 8 (or next major release)?

Not yet. Some surveys suggest as many as 30% of browsers are IE  9. That is
too big a chunk of the user base to exclude from the docs.

A better analysis would be to look at the access logs for the Tomcat docs. I'm
unlikely to have the time to do that for a while.

-- 
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: r1517980 - /tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java

2013-08-27 Thread markt
Author: markt
Date: Tue Aug 27 20:51:06 2013
New Revision: 1517980

URL: http://svn.apache.org/r1517980
Log:
Fix comment

Modified:

tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java?rev=1517980r1=1517979r2=1517980view=diff
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java 
(original)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java 
Tue Aug 27 20:51:06 2013
@@ -198,7 +198,7 @@ public class TestChunkedInputFilter exte
 client.connect();
 client.processRequest();
 // Expected to fail because the trailers are longer
-// than the default limit of 8Kb
+// than the set limit of 10 bytes
 assertTrue(client.isResponse500());
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 55477] Add a solution to map an realm name to a security role

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55477

--- Comment #4 from Stefan Mayr ste...@mayr-stefan.de ---
Usual bean settings (like for a custom resource) which can be expressed in sub
xml elements are attributes in the server.xml file.

configuration in beans:
property name=map
props key=role1value1/props
props key=role2value2/props
/property

Tomcat: map=???

Any pointer what I should search for?

-- 
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 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #16 from Rainer Jung rainer.j...@kippdata.de ---
  BTW, what do you think about switching from HTML to XHTML for the docs of
  Tomcat 8 (or next major release)?
 
 Not yet. Some surveys suggest as many as 30% of browsers are IE  9. That is
 too big a chunk of the user base to exclude from the docs.
 
 A better analysis would be to look at the access logs for the Tomcat docs.
 I'm unlikely to have the time to do that for a while.

After about 22 hours of todays logs: MSIE  9 is about 12% of all requests to
the TC vhost access logs and about 10% of the ones to doc content. All
requests means all excluding obvious bots.

Of all MSIE requests, MSIE 5-8 are about 50-60%.

More detailed data:

tomcat.apache.org (US)AllDocs
UACountPctCum PctCountPctCum Pct
Chrome6393241,9%41,9%2489145,3%45,3%
Firefox3673024,1%66,0%1588928,9%74,3%
Safari55183,6%69,6%16703,0%77,3%
AppleWebKit other1650,1%69,7%710,1%77,5%
Opera17311,1%70,9%4910,9%78,4%
Varia112567,4%78,2%25274,6%83,0%
MSIE 54140,3%78,5%80,0%83,0%
MSIE 619731,3%79,8%4650,8%83,8%
MSIE 737602,5%82,3%9681,8%85,6%
MSIE 8125308,2%90,5%38787,1%92,6%
MSIE 975264,9%95,4%23464,3%96,9%
MSIE 1069814,6%100,0%16933,1%100,0%
Sum152516100,0%54897100,0%

MSIE 5-81867712,2%53199,7%

tomcat.apache.org (EU)AllDocs
UACountPctCum PctCountPctCum Pct
Chrome7237243,7%43,7%2692345,5%45,5%
Firefox4020824,3%68,0%1736129,3%74,8%
Safari59203,6%71,5%20363,4%78,2%
AppleWebKit other2000,1%71,7%650,1%78,3%
Opera17451,1%72,7%6201,0%79,4%
Varia107676,5%79,2%25384,3%83,7%
MSIE 56620,4%79,6%50,0%83,7%
MSIE 620051,2%80,8%3140,5%84,2%
MSIE 740482,4%83,3%9771,6%85,9%
MSIE 8127977,7%91,0%41467,0%92,9%
MSIE 980784,9%95,9%24294,1%97,0%
MSIE 1068324,1%100,0%18033,0%100,0%
Sum165634100,0%59217100,0%

MSIE 5-81951211,8%54429,2%

-- 
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 55383] Improve markup and design of Tomcat's HTML pages

2013-08-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383

--- Comment #17 from Konstantin Preißer prei...@web.de ---
Created attachment 30772
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=30772action=edit
First part of updated documentation XMLs

Hi,

I attached a patch with a first part of updated doc XML files to improve the
HTML markup and follow up to the new XSLT. The changes include:
- Ensure that a p does not contain pre, ul, ol etc. tags.
- Use fragment identifiers that have a space replaced with _.
- Replace presentational tags/attributes with CSS; only use
  table when it is really a table.
- Use CDATA section in source elements so that source code/XML examples
  in the doc XMLs is better readable (I hope this is OK).


Mark and Rainer,
(In reply to Mark Thomas from comment #15)
 Not yet. Some surveys suggest as many as 30% of browsers are IE  9. That is
 too big a chunk of the user base to exclude from the docs.

(In reply to Rainer Jung from comment #16)
 After about 22 hours of todays logs: MSIE  9 is about 12% of all requests
 to the TC vhost access logs and about 10% of the ones to doc content. All
 requests means all excluding obvious bots.

I agree that 30% IE  9 users is still too many to switch to XHTML now
(probably even the 12%).
(Argh - Old IEs keep being a nightmare for web designers :)

-- 
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



[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

2013-08-27 Thread Bill Barker
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 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 50 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 :  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/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on junit exists, no need to add for property hamcrest.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-trunk 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-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 52 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/dist/junit-20130828.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.1-SNAPSHOT.jar
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20130828-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20130828.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20130828-native-src.tar.gz
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool 
-Dcommons-dbcp.home=/
 srv/gump/public/workspace/apache-commons/dbcp 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/public/workspace/junit/dist/junit-20130828.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/servle
 
t-api.jar:/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/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat