DO NOT REPLY [Bug 38052] JDBCAccessLogValve uses reserved word "user" as column name

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38052

Trooprex  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |

--- Comment #4 from Trooprex  2012-02-16 09:56:28 UTC ---
How do we get this Valve working for Oracle.

1. Oracle doesn't have Auto_Increment, instead they have sequences.
2. Oracle cannot directly create a table as access. It had to be "access".
   (Anyways I worked it around with tableName = "accesslogs" in the server.xml)

I had to strip down the table struct to this 

CREATE TABLE accesslogs (
 id VARCHAR(255),
 remoteHost CHAR(15),
 userName CHAR(15),
 timestamp TIMESTAMP,
 virtualHost VARCHAR(64),
 method VARCHAR(8),
 query VARCHAR(255),
 status SMALLINT,
 bytes INT,
 referer VARCHAR(128),
 userAgent VARCHAR(128)
  );

Can this valve provide fix for the default table struct?

Also, the valve fails to log in the Oracle DB if I use the following pattern 

pattern="Combined Log Format: %{X-Forwarded-For}i %a %h %q %v %D %T %l %u %t %r
%s %b %{User-Agent}i %{Referer}i"

It works well for pattern="combined"

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1244914 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default

2012-02-16 Thread markt
Author: markt
Date: Thu Feb 16 10:12:13 2012
New Revision: 1244914

URL: http://svn.apache.org/viewvc?rev=1244914&view=rev
Log:
Increment ready for next release

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1244914&r1=1244913&r2=1244914&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Feb 16 10:12:13 2012
@@ -27,7 +27,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=25
+version.build=26
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1244914&r1=1244913&r2=1244914&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Feb 16 10:12:13 
2012
@@ -35,12 +35,12 @@ maven.snapshot.repo.repositoryId=apache.
 #Maven release properties for Tomcat staging
 
maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
 maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=7.0.25
+maven.release.deploy.version=7.0.26
 
 #Maven release properties for the main ASF repo (staging in nexus)
 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
 maven.asf.release.repo.repositoryId=apache.releases
-maven.asf.release.deploy.version=7.0.25
+maven.asf.release.deploy.version=7.0.26
 
 
 #Where do we load the libraries from



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



svn commit: r1244927 - in /tomcat/trunk: modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/ test/org/apache/catalina/

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 10:58:21 2012
New Revision: 1244927

URL: http://svn.apache.org/viewvc?rev=1244927&view=rev
Log:
Set svn:eol-style=native on 5 files,
as detected by validate-eoln target run on Gump

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
   (contents, props changed)

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/InduceSlowQuery.java
   (contents, props changed)
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java   
(contents, props changed)
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java   
(contents, props changed)
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java   
(contents, props changed)

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java?rev=1244927&r1=1244926&r2=1244927&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
 Thu Feb 16 10:58:21 2012
@@ -1,136 +1,136 @@
-/*
- * 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.
- */
-package org.apache.tomcat.jdbc.bugs;
-
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tomcat.jdbc.pool.ConnectionPool;
-import org.apache.tomcat.jdbc.pool.PoolConfiguration;
-import org.apache.tomcat.jdbc.test.DefaultProperties;
-
-
-public class Bug51582
-{
-
-  /**
-   * @param args
-   * @throws SQLException
-   */
-  public static void main(String[] args) throws SQLException
-  {
-org.apache.tomcat.jdbc.pool.DataSource datasource = null;
-PoolConfiguration p = new DefaultProperties();
-
-p.setJmxEnabled(true);
-p.setTestOnBorrow(false);
-p.setTestOnReturn(false);
-p.setValidationInterval(1000);
-p.setTimeBetweenEvictionRunsMillis(2000);
-
-p.setMaxWait(2000);
-p.setMinEvictableIdleTimeMillis(1000);
-
-datasource = new org.apache.tomcat.jdbc.pool.DataSource();
-datasource.setPoolProperties(p);
-
datasource.setJdbcInterceptors("org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx(threshold=200)");
-ConnectionPool pool = datasource.createPool();
-
-
-Connection con = pool.getConnection();
-Statement st = con.createStatement();
-try {
-st.execute("DROP ALIAS SLEEP");
-}catch (Exception ignore) {}
-st.execute("CREATE ALIAS SLEEP AS $$\nboolean sleep() {\ntry {\n   
 Thread.sleep(1);\nreturn true;} catch 
(Exception x) {\nreturn false;\n}\n}\n$$;");
-st.close();
-con.close();
-int iter = 0;
-while ((iter++) < 10)
-{
-  final Connection connection = pool.getConnection();
-  final CallableStatement s = connection.prepareCall("{CALL SLEEP()}");
-
-  List threadList = new ArrayList();
-
-  for (int l = 0; l < 3; l++)
-  {
-final int i = l;
-
-Thread thread = new Thread()
-{
-  @Override
-  public void run()
-  {
-try
-{
-  if (i == 0)
-  {
-Thread.sleep(1000);
-s.cancel();
-  }
-  else if (i == 1)
-  {
-//or use some other statement which will block for a longer 
time
-long start = System.currentTimeMillis();
-System.out.println("["+getName()+"] Calling SP SLEEP");
-s.execute();
-System.out.println("["+getName()+"] Executed SP SLEEP 
["+(System.currentTimeMillis()-start)+"]");
-  }
-  else
-  {
-Thread.sleep(1000);
-connection.close();
-  }
-}
-catch (InterruptedException e)
-  

[jira] [Commented] (MTOMCAT-74) Deploy war type plugin dependencies with tomcat:run

2012-02-16 Thread Dave Syer (Commented) (JIRA)

[ 
https://issues.apache.org/jira/browse/MTOMCAT-74?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13209265#comment-13209265
 ] 

Dave Syer commented on MTOMCAT-74:
--

Mark, I'm not really sure what you are saying.  If you want to re-purpose the 
addContextWarDependencies flag to look in plugin dependencies instead of 
project dependencies that's a great idea, but it won't work in mvn 3 if we 
still use the dependency type "tomcat" (it's illegal now as a plugin dependency 
type and gets a fat warning as a normal dependency type).  I can't see the 
patch because JIRA barfs on me when I click on the link.  What does it do and 
when is it going to be applied?

Plus addContextWarDependencies is not working for me as it did in 1.1 - I can 
see the war unpacked (in two separate directories), but it never gets deployed 
into the container.  Maybe the default server.xml is ballsed up (where is it)?  
Should I open anothre ticket for this?

> Deploy war type plugin dependencies with tomcat:run
> ---
>
> Key: MTOMCAT-74
> URL: https://issues.apache.org/jira/browse/MTOMCAT-74
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Improvement
>Affects Versions: 1.1
> Environment: all
>Reporter: Ryan Connolly
>  Labels: tocheck
> Attachments: tomcat-run-pluginDependency-war-deployment.patch
>
>
> It would be nice to be able to run a war file in the embedded container 
> alongside the current war project being developed.  As 
> addContextWarDependencies only looks at project dependencies and not those 
> configured as plugin dependencies it may be worthwhile to add another option 
> for deploying these types: addContextWarPluginDependencies.
> An example configuration may resemble the following:
> {code:language=xml}
> 
>   org.codehaus.mojo
>   tomcat-maven-plugin
>   
> true
> /
>   
>   
> 
>   my.groupId
>   mywar-artifact
>   1.0
>   war
> 
>   
> 
> {code}

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



svn commit: r1244935 - /tomcat/trunk/bin/daemon.sh

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 11:26:27 2012
New Revision: 1244935

URL: http://svn.apache.org/viewvc?rev=1244935&view=rev
Log:
Change svn:eol-style from LF to native

Modified:
tomcat/trunk/bin/daemon.sh   (props changed)

Propchange: tomcat/trunk/bin/daemon.sh
--
--- svn:eol-style (original)
+++ svn:eol-style Thu Feb 16 11:26:27 2012
@@ -1 +1 @@
-LF
+native



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



svn commit: r1244936 - /tomcat/tc7.0.x/trunk/bin/daemon.sh

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 11:27:24 2012
New Revision: 1244936

URL: http://svn.apache.org/viewvc?rev=1244936&view=rev
Log:
Change svn:eol-style from LF to native

Modified:
tomcat/tc7.0.x/trunk/bin/daemon.sh   (props changed)

Propchange: tomcat/tc7.0.x/trunk/bin/daemon.sh
--
--- svn:eol-style (original)
+++ svn:eol-style Thu Feb 16 11:27:24 2012
@@ -1 +1 @@
-LF
+native



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



svn commit: r1244938 - in /tomcat/trunk/test/org/apache: catalina/startup/ coyote/ajp/

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 11:30:33 2012
New Revision: 1244938

URL: http://svn.apache.org/viewvc?rev=1244938&view=rev
Log:
Set svn:eol-style=native on 10 files,
as detected by validate-eoln target run on Windows

Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java   (props 
changed)
tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml   (props 
changed)
tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml   (props 
changed)
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml   
(props changed)
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml   
(props changed)
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml   
(props changed)
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml   
(props changed)
tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java   (props 
changed)
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java   
(props changed)
tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java   (props 
changed)

Propchange: tomcat/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java
--
svn:eol-style = native



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



svn commit: r1244942 - in /tomcat/tc7.0.x/trunk: modules/ webapps/docs/changelog.xml

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 11:38:08 2012
New Revision: 1244942

URL: http://svn.apache.org/viewvc?rev=1244942&view=rev
Log:
Update jdbc-pool external to get eol-style fix.
Fix a typo in the changelog.

Modified:
tomcat/tc7.0.x/trunk/modules/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/modules/
--
--- svn:externals (original)
+++ svn:externals Thu Feb 16 11:38:08 2012
@@ -1 +1 @@
-^/tomcat/trunk/modules/jdbc-pool@1243812 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool@1244927 jdbc-pool

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=1244942&r1=1244941&r2=1244942&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Feb 16 11:38:08 2012
@@ -288,7 +288,7 @@
   
   
 52245: Don't allow web applications to package classes from
-the javax.el package. Patch provide by pid. (markt)
+the javax.el package. Patch provided by pid. (markt)
   
   
 52259: Fix regression caused by the addition of the threaded



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



svn commit: r1244951 - in /tomcat/tc7.0.x/trunk: ./ build.xml java/org/apache/tomcat/buildutil/CheckEol.java webapps/docs/changelog.xml

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 12:05:58 2012
New Revision: 1244951

URL: http://svn.apache.org/viewvc?rev=1244951&view=rev
Log:
Merged revision 1244302 from tomcat/trunk:
Implement check for correct end-of-line characters in the source files.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
  - copied unchanged from r1244302, 
tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 12:05:58 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,123286

svn commit: r1244955 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/ test/org/apache/coyote/ajp/

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 12:17:26 2012
New Revision: 1244955

URL: http://svn.apache.org/viewvc?rev=1244955&view=rev
Log:
Set svn:eol-style=native on 10 files,
as detected by validate-eoln target run on Windows

Update mergeinfo to mark eol fixing revisions from trunk as having been merged, 
r1244935 and r1244938

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java   
(props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml   
(props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml   
(props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml   
(props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml   
(props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java   
(props changed)

tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java   
(props changed)
tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java   
(props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 12:17:26 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222

DO NOT REPLY [Bug 52669] Annotation processing, in WEB-INF/classes, for Servlets/Listeners/Filters is skipped when the web app is not extracted, classes do not have packages and for some embedded scen

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52669

--- Comment #6 from violet...@apache.org 2012-02-16 12:23:50 UTC ---
Thanks!
Violeta

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: WebSocket progress report

2012-02-16 Thread Petr Praus
Thanks Johno Crawford for pointing out that attachments are stripped, I
uploaded the patch here: https://gist.github.com/1844837

On Wed, Feb 15, 2012 at 22:01, Petr Praus  wrote:

> Hello, attached is our patch. It applies cleanly on top of current trunk
> rev. 1244719. It has rudimentary support for fragmentation (callback after
> last frame), supports close messages and ping/pong. Sorry for not sending a
> patchset but I thought it wouldn't really make sense, since there were
> quite a lot of back and forth changes. Let me know if I should send a
> patchset instead.
>
> (Jonathan's summary)
> "Echoing fragments. Close messages. Pings/pongs.
>
> Just barely works. :) Fragmentation support is very limited: a mere
> callback when last frame received. Sends normal closing reply messages
> and some protocol error closes. Answers pings with pongs. Moving
> towards a better application API. The servlet container is doing
> something I don't understand with rapid connection attempts…not sure
> what's up. I renamed StreamInbound to WebSocketConnection since it's
> bidirectional. Also I gave the upgrade processors close() methods.
> Fixed a number of bugs, including a switch statement with accidentally
> cascading cases, and a problem with in Conversions.byteArrayToLong()."
>
> Thanks,
> Petr
>
>
> On Wed, Feb 15, 2012 at 17:17, Petr Praus  wrote:
>
>> Hi, sorry for the delay, we got stalled a little bit, I'll post the patch
>> today (US central time) after I manage to merge it (oh the cursed newlines).
>> Thanks,
>> Petr
>>
>>
>> On Mon, Feb 13, 2012 at 14:18, Christopher Schultz <
>> ch...@christopherschultz.net> wrote:
>>
>>> Jeremy,
>>>
>>> On 2/10/12 12:08 PM, Jeremy Brown wrote:
>>> >> I suspect it will need more than that. The XLST will almost certainly
>>> >> need some tweaks too.
>>> >
>>> > How timely, I'm doing xml transformations in my SOA class right now.
>>>
>>> If you have any questions about XSLT, I'd be happy to answer them. It's
>>> definitely something that you have to have a Zenlike relationship with
>>> in order to do properly.
>>>
>>> Just like Lisp, it's possible to write really awful
>>> procedurally-oriented code with it, but then it just sucks horribly.
>>>
>>> We've been using XSLT for a long time with Apache Cocoon (such a great
>>> product) to transform XML into XHTML. I'd be happy to help.
>>>
>>> -chris
>>>
>>>
>>
>


Re: AccessLogValve enhancement

2012-02-16 Thread Mark Claassen
Looking at the docs, it looks like the asynchronous parts of the logging
mechanism are controlled through the logging configuration in either
logging.properties or log4j.properties.  I don't see any way to ensure that
this is the case or to check to make sure the output is not going to the
console.

That being said, this is just an option, and would hopefully be acceptable
in many situations.  I have not done tests to see the performance
difference.  Perhaps a strongly worded warning in the documentation would
be sufficient to ensure people are smart about this?

Unless someone thinks that this change is unacceptable, I will continue my
efforts and see what happens with it.

Thanks,
Mark

On Wed, Feb 15, 2012 at 5:07 PM, Konstantin Kolinko
wrote:

> 2012/2/16 Mark Claassen :
> > We would like to use the flexibility of the standard logging mechanism
> for
> > the AccessLogValue.  I could find no way to do this.  Looking at the
> > AccessLogValve code in Tomcat 7, it seems it would really would not be
> hard
> > to add.
> >
> > There already is standard logger in the AccessLogValve class, which is
> > where error in the logger itself get routed.
> >private static final Log log =
> LogFactory.getLog(AccessLogValve.class);
> >
> > This still makes a lot of sense, and should probably be kept separate.
> > What I would propose is that a new attribute be added, called maybe
> > "systemLoggerName".  If this is set, then the logger by that name would
> be
> > used instead of the current hard-coded file logger.  (Errors would still
> go
> > to the statically defined Logger.)
> >
> > I already tried this with the XML listed below and a slightly modified
> > AccessLogValve and it seems to work perfectly.  If this is something that
> > would be considered a positive change, I would be happy to submit a patch
> > and propose some documentation updates.
> >
> > I am not exactly sure how this all works, especially since this is more
> of
> > an enhancement rather than a bug fix.  I sure there are guidelines for
> when
> > in a release cycle these types of changes are appropriate.
> >
> > Mark
> >
> >
> >  >  className="org.apache.catalina.valves.AccessLogValve"
> >  directory="log"
> >  prefix="localhost_access_log."
> >  systemLoggerName="mylogger"
> >  pattern="common"
> >  resolveHosts="false"/>
>
> I would say that the performance requirements for the two are different.
> Access log should be fast and simple. The error log does not have to
> be as fast, as errors should be more rare.
>
> The default JULI FileHandler is not suitable here. You have to
> configure buffers. You have to perform flushing. AccessLogValve wires
> to Tomcat's background processing, but IIRC you cann do flush via
> commons-logging wrapper.   The only viable alternative here is
> AsyncFileHandler.
>
> You should also make sure that the events wouldn't be printed to Console.
>
>
> The ideas to extract some common code to elsewhere (e.g. time
> formatting cache) were spoken several times. They are feasible.
>
>
> Regarding this "systemLoggerName" (or "logCategory" as I would name
> it) feature, I think it does not belong to the current AccessLogValve
> but you might plug it there after some refactoring.
>
> Anyway I would like to see the whole picture, which includes the
> logging configuration that you would use with AccessLogValve.
>
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


DO NOT REPLY [Bug 52651] JKSHMFile size limitation

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52651

--- Comment #2 from van Aerssen  2012-02-16 15:38:15 UTC ---
Created attachment 28339
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28339
mod_jk log with JKshmsize set to 256

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52651] JKSHMFile size limitation

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52651

--- Comment #3 from van Aerssen  2012-02-16 15:38:50 UTC ---
Created attachment 28340
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28340
mod_jk log without the JKshmsize set

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52651] JKSHMFile size limitation

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52651

--- Comment #4 from van Aerssen  2012-02-16 15:39:34 UTC ---
Created attachment 28341
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28341
worker.properties with 350 workers

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52651] JKSHMFile size limitation

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52651

--- Comment #5 from van Aerssen  2012-02-16 15:43:59 UTC ---
Hello,

I made some more tests with 350 workers with and without the JKshmsize (set to
256 or removed) (see workers.properties in attach)
with the JKshmsize set to 256 apache won't start
witout the settings, apache start as expected.

now, i've to generate enough load to generate 503 errors, and be able to see
the RST packages from apache... 

I can easily reproduce it on our "real" environment, but i have a lot of poeple
working there... and i cannot blocke their testing :-s

JF

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: svn commit: r1244574 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/lang/ELSupport.java test/org/apache/el/lang/TestELSupport.java webapps/docs/changelog.xml

2012-02-16 Thread Konstantin Kolinko
2012/2/15  :
> Author: markt
> Date: Wed Feb 15 16:30:37 2012
> New Revision: 1244574
>
> URL: http://svn.apache.org/viewvc?rev=1244574&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52666
> Correct coercion order in EL for A {==,!=,eq,ne} B
>
> Modified:
>    tomcat/tc7.0.x/trunk/   (props changed)
>    tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ELSupport.java
>    tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
>    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>

Regarding ELSupport#compare() and ELSupport#equals()
Their Javadoc comments document how those methods are implemented.
With this fix applied the equals() method Javadoc does not match
implementation anymore.

I think it should mention EL 1.8.1 and EL 1.8.2 as specifications
behind this implementation.

Though there is some small difference between EL 1.8.1 and compare()
in handling of null values. Anyway compare() cannot handle nulls per
EL 1.8.1 as it cannot return "false" but returns an integer. The
compare() method has its own special treatment of nulls as its javadoc
says.

It is only documentation issue. The code itself is OK.
It is not an issue for 6.0, because Javadoc for these methods is
essentially empty there.

I plan to look into fixing this later, but anyone can beat me over it.

Best regards,
Konstantin Kolinko


> Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ELSupport.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=1244574&r1=1244573&r2=1244574&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ELSupport.java Wed Feb 15 
> 16:30:37 2012
> @@ -127,35 +127,31 @@ public class ELSupport {
>             return true;
>         } else if (obj0 == null || obj1 == null) {
>             return false;
> -        } else if (obj0 instanceof Boolean || obj1 instanceof Boolean) {
> -            return coerceToBoolean(obj0).equals(coerceToBoolean(obj1));
> -        } else if (obj0.getClass().isEnum()) {
> -            return obj0.equals(coerceToEnum(obj1, obj0.getClass()));
> -        } else if (obj1.getClass().isEnum()) {
> -            return obj1.equals(coerceToEnum(obj0, obj1.getClass()));
> -        } else if (obj0 instanceof String || obj1 instanceof String) {
> -            int lexCompare = 
> coerceToString(obj0).compareTo(coerceToString(obj1));
> -            return (lexCompare == 0) ? true : false;
> -        }
> -        if (isBigDecimalOp(obj0, obj1)) {
> +        } else if (isBigDecimalOp(obj0, obj1)) {
>             BigDecimal bd0 = (BigDecimal) coerceToNumber(obj0, 
> BigDecimal.class);
>             BigDecimal bd1 = (BigDecimal) coerceToNumber(obj1, 
> BigDecimal.class);
>             return bd0.equals(bd1);
> -        }
> -        if (isDoubleOp(obj0, obj1)) {
> +        } else if (isDoubleOp(obj0, obj1)) {
>             Double d0 = (Double) coerceToNumber(obj0, Double.class);
>             Double d1 = (Double) coerceToNumber(obj1, Double.class);
>             return d0.equals(d1);
> -        }
> -        if (isBigIntegerOp(obj0, obj1)) {
> +        } else if (isBigIntegerOp(obj0, obj1)) {
>             BigInteger bi0 = (BigInteger) coerceToNumber(obj0, 
> BigInteger.class);
>             BigInteger bi1 = (BigInteger) coerceToNumber(obj1, 
> BigInteger.class);
>             return bi0.equals(bi1);
> -        }
> -        if (isLongOp(obj0, obj1)) {
> +        } else         if (isLongOp(obj0, obj1)) {
>             Long l0 = (Long) coerceToNumber(obj0, Long.class);
>             Long l1 = (Long) coerceToNumber(obj1, Long.class);
>             return l0.equals(l1);
> +        } else if (obj0 instanceof Boolean || obj1 instanceof Boolean) {
> +            return coerceToBoolean(obj0).equals(coerceToBoolean(obj1));
> +        } else if (obj0.getClass().isEnum()) {
> +            return obj0.equals(coerceToEnum(obj1, obj0.getClass()));
> +        } else if (obj1.getClass().isEnum()) {
> +            return obj1.equals(coerceToEnum(obj0, obj1.getClass()));
> +        } else if (obj0 instanceof String || obj1 instanceof String) {
> +            int lexCompare = 
> coerceToString(obj0).compareTo(coerceToString(obj1));
> +            return (lexCompare == 0) ? true : false;
>         } else {
>             return obj0.equals(obj1);
>         }
>

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



svn commit: r1245055 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 16:10:45 2012
New Revision: 1245055

URL: http://svn.apache.org/viewvc?rev=1245055&view=rev
Log:
vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1245055&r1=1245054&r2=1245055&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 16 16:10:45 2012
@@ -111,6 +111,9 @@ PATCHES PROPOSED TO BACKPORT:
   2) Patch
 http://people.apache.org/~kkolinko/patches/2012-01-18_tc6_LicenseRtf.patch
 
+  +1: kkolinko
+  -1:
+
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52579
   Propose new implementation of ByteChunk.toStringInternal().
   This fix does not reintroduce issue BZ51400.
@@ -128,13 +131,13 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52548
   Upgrade to Commons Daemon 1.0.9
   http://svn.apache.org/viewvc?rev=1244519&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52666
   Correct coercion order in EL for A {==,!=,eq,ne} B
   http://svn.apache.org/viewvc?rev=1244567&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 



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



DO NOT REPLY [Bug 52685] New: distributable mode does not work with Servlet 3.0

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52685

 Bug #: 52685
   Summary: distributable mode does not work with Servlet 3.0
   Product: Tomcat 7
   Version: 7.0.25
  Platform: Other
OS/Version: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: lucas.pouzac@gmail.com
Classification: Unclassified


If in web.xml, I declare:

http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; version="2.5"> 
 ...
 
 ...


the session replication works (org.apache.catalina.ha.session.BackupManager).

But, if I declare: 

http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://java.sun.com/xml/ns/javaee";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; version="3.0">
 ...
 
 ...


the session replication doesn't work
(org.apache.catalina.session.StandardManager).

(with 7.0.14 and 7.0.25 tomcat version).

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52685] distributable mode does not work with Servlet 3.0

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52685

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2012-02-16 17:27:25 UTC ---
This works for me. I suspect you have a configuration problem. The users list
is the place to seek help.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #36 from Johno Crawford  2012-02-16 17:47:38 UTC 
---
Created attachment 28342
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28342
Fragmentation control frames

Attaching patch sent by Petr Praus (mailing list).

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



[jira] [Created] (MTOMCAT-119) tomcat7:run-war fails because it expects META-INF\context.xml

2012-02-16 Thread Samuel Langlois (Created) (JIRA)
tomcat7:run-war fails because it expects META-INF\context.xml
-

 Key: MTOMCAT-119
 URL: https://issues.apache.org/jira/browse/MTOMCAT-119
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.0-beta-1
Reporter: Samuel Langlois
Assignee: Olivier Lamy


run-war and run-war-only goals fail on tomcat7 plugin, looking for the file 
=META-INF\context.xml=

How to reproduce:
* Use the archetype to create a project
mvn archetype:generate -DarchetypeGroupId=org.apache.tomcat.maven 
-DarchetypeArtifactId=tomcat-maven-archetype -DarchetypeVersion=2.0-beta-1
* Build it
* cd basic-webapp
* mvn org.apache.tomcat.maven:tomcat6-maven-plugin:run-war
=> works fine
* mvn org.apache.tomcat.maven:tomcat7-maven-plugin:run
=> works fine
* mvn org.apache.tomcat.maven:tomcat7-maven-plugin:run-war
-> kaboom
{code}
[INFO] --- tomcat7-maven-plugin:2.0-beta-1:run-war (default-cli) @ basic-webapp 
---
[INFO] Running war on http://localhost:9090/
[INFO] Using existing Tomcat server configuration at 
C:\Users\SAMUEL~1.LAN\AppData\Local\Temp\com.antelink.toto\basic-webapp\target\tomcat
févr. 16, 2012 6:56:24 PM org.apache.coyote.AbstractProtocol init
Infos: Initializing ProtocolHandler ["http-bio-9090"]
févr. 16, 2012 6:56:24 PM org.apache.catalina.core.StandardService startInternal
Infos: Starting service Tomcat
févr. 16, 2012 6:56:24 PM org.apache.catalina.core.StandardEngine startInternal
Infos: Starting Servlet Engine: Apache Tomcat/7.0.25
févr. 16, 2012 6:56:24 PM org.apache.catalina.startup.ContextConfig 
processContextConfig
Grave: Missing context.xml: 
file:/C:/Users/SAMUEL~1.LAN/AppData/Local/Temp/com.antelink.toto/basic-webapp/target/basic-webapp-1.0-SNAPSHOT/META-INF/context.xml
java.io.FileNotFoundException: 
C:\Users\SAMUEL~1.LAN\AppData\Local\Temp\com.antelink.toto\basic-webapp\target\basic-webapp-1.0-SNAPSHOT\META-INF\context.xml
 (Le fichier spécifié est introuvable)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.(FileInputStream.java:138)
at java.io.FileInputStream.(FileInputStream.java:97)
at 
sun.net.www.protocol.file.FileURLConnection.connect(FileURLConnection.java:90)
at 
sun.net.www.protocol.file.FileURLConnection.getInputStream(FileURLConnection.java:188)
at java.net.URL.openStream(URL.java:1035)
at 
org.apache.catalina.startup.ContextConfig.processContextConfig(ContextConfig.java:565)
at 
org.apache.catalina.startup.ContextConfig.contextConfig(ContextConfig.java:546)
at 
org.apache.catalina.startup.ContextConfig.init(ContextConfig.java:784)
at 
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:318)
at 
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at 
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at 
org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:401)
at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:110)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:139)
{code}

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



DO NOT REPLY [Bug 52686] New: Tomcat7w will not run without runas Administrator

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52686

 Bug #: 52686
   Summary: Tomcat7w will not run without runas  Administrator
   Product: Tomcat 7
   Version: 7.0.25
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
AssignedTo: dev@tomcat.apache.org
ReportedBy: mikebel...@yahoo.com
Classification: Unclassified


After installing tomcat, one finds the nice little system tray will not load. 

1. The immediate reason is tomcat7w.exe must run as administrator.
2. A MANUAL workaround is for the customer to go to startup, right click,
choose advanced, and select Run as administrator.
3. However, people shouldn't have to do this manually
4. The next way to do things (and the more official way) is to use an
application manifest. 
5. These can be installed manually or embedded. An example might be




Force Tomcat to run as admin for config









6. However, saving this as tomcat7w.exe.manifest will still fail.
7. This is because tomcat7w already includes an embedded manifest, and in these
cases windows ignores the external manifest.

Proposal is to fix the embedded manifest. The current manifest is
  
-  
 
   
  Apache Procrun Service Manager 
 
 
   
  
  
  

and that should be modified to

  
  
 
   
  Apache Procrun Service Manager 







 
 
   
  
  
  

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52686] Tomcat7w will not run without runas Administrator

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52686

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-02-16 18:27:43 UTC ---
You need to raise this against Apache Commons Daemon which provides this
component that Tomcat uses.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1245119 - /tomcat/tc5.5.x/trunk/STATUS.txt

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Thu Feb 16 19:03:31 2012
New Revision: 1245119

URL: http://svn.apache.org/viewvc?rev=1245119&view=rev
Log:
vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1245119&r1=1245118&r2=1245119&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Feb 16 19:03:31 2012
@@ -38,11 +38,11 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Upgrade to Commons Daemon 1.0.9
   http://svn.apache.org/viewvc?rev=1244511&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52640
   Correct endorsed dir location when using installer
   http://people.apache.org/~markt/patches/2012-02-15-bug52640-tc5.patch
-  +1: markt
+  +1: markt, kkolinko
   -1:



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



Re: AccessLogValve enhancement

2012-02-16 Thread Konstantin Kolinko
2012/2/17 Mark Claassen :
> I attached the two new valves in a zip file,

Do not send attachments to this mailing list ever!

The proper procedure is documented here:
http://tomcat.apache.org/bugreport.html#How_to_submit_patches_and_enhancement_requests

Best regards,
Konstantin Kolinko

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



DO NOT REPLY [Bug 52688] New: Added ability to have access logs output to standard logging mechanism

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52688

 Bug #: 52688
   Summary: Added ability to have access logs output to standard
logging mechanism
   Product: Tomcat 7
   Version: 7.0.25
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: markclaass...@gmail.com
Classification: Unclassified


Created attachment 28344
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28344
Diff of AccessLogValve patch

The current AccessLogValve implementation uses a custom file writer instead of
the normal log mechanism.  There are circumstances where it would be nice to
have the power and flexibility of the standard logging capabilities.

This was briefly discussed in a email thread with subject 'AccessLogValve
enhancement' from 2.15.2012

Attached is a proposed patch to add this capability, however I think it is
still up for debate if this is a good enhancement.  This would be an option
that people wouldn't have to use.

I believe it will work for me and is hopefully generally useful (otherwise it
doesn't make a good enhancement and is just clutter.)   Earlier, I was trying
to see how to do this by searching on the web and I found several others asking
the same thing.  So, I think there are many others who at least think they want
this feature.

Issues:
* (Potential performance, as mentioned previously)
* "common" pattern for AccessLogValve includes timestamp, which is also often
included in log record headers.
* header messages (#VERSION, #FIELDS:, #SOFTWARE) won't repeat in log files,
and are not
  necessarily useful in the initial one. (#FIELD is null, presumably because
its attribute was later in my server.xml file.)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52688] Added ability to have access logs output to standard logging mechanism

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52688

--- Comment #1 from Mark  2012-02-16 21:41:17 UTC ---
Created attachment 28345
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28345
Diff of ExtendedAccessLogValve

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52688] Added ability to have access logs output to standard logging mechanism

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52688

Mark  changed:

   What|Removed |Added

  Attachment #28344|0   |1
   is patch||
  Attachment #28344|application/octet-stream|text/plain
  mime type||

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: AccessLogValve enhancement

2012-02-16 Thread Mark Claassen
Apologies.  Won't happen again.  I saw an attachment on an email from the
15th, but I see this was just junk.

I created at issue for this (52688) and attached the diffs.

On Thu, Feb 16, 2012 at 4:12 PM, Konstantin Kolinko
wrote:

> 2012/2/17 Mark Claassen :
> > I attached the two new valves in a zip file,
>
> Do not send attachments to this mailing list ever!
>
> The proper procedure is documented here:
>
> http://tomcat.apache.org/bugreport.html#How_to_submit_patches_and_enhancement_requests
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


Re: SPDY support

2012-02-16 Thread Mark Thomas
On 16/02/2012 01:44, Costin Manolache wrote:
> That doesn't mean the application must receive the entire message as one
> byte[]
> or as a Stream.
> You can have a very large fragment but still read it in smaller buffers and
> notify
> the user of message start and for each fragment ( I guess like xml parsing
> ).

I see where you are coming from now. A purely message based API would be
possible in that case. The downside is increased complexity in the
applications as they would have to maintain additional state across
messages. I'm not completely against the approach, just not yet
convinced that the trade is worth it. I'd prefer to have some hard
evidence to work with but that is unlikely to be forthcoming until folks
start using this API. With that in mind, I'm going to focus on the
various contributions folks have made and move the implementation closer
to something that is usable.

Mark

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



DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #37 from Mark Thomas  2012-02-16 22:35:46 UTC ---
I can see the possible requirement for access to the request headers when
verifying the origin (and a few other processes). However, I'm leaning towards
not implementing that now and adding it later if there is a demand for it. If
we go that route I do think we just need prevent access to the request since
the problems that would start if a reference to the request is retained are not
pretty. I'd probably just wrap the request in a facade that exposed the headers
in read-only form and nothing else.

I'm now looking at the sub-protocol parts. The good news is that protocol names
are token which makes parsing them simple (the approach used in the patch is
fine - just not the way I would have done it). However, my reading of the
specification is slightly different from the patch as implemented. There are
two differences:
a) I see no requirement for the server to respect the clients preference order
for sub-protocols. Therefore, we need to pass the complete list of requested
sub-protocols to the user servlet for it to pick one
b) The server is free to not select one of the sub-protocols. This is not an
error state.

Hopefully, I'll add the protocol handling stuff later this evening.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1245245 - in /tomcat/trunk: java/org/apache/catalina/websocket/ test/org/apache/catalina/websocket/ webapps/examples/WEB-INF/classes/websocket/

2012-02-16 Thread markt
Author: markt
Date: Thu Feb 16 23:16:40 2012
New Revision: 1245245

URL: http://svn.apache.org/viewvc?rev=1245245&view=rev
Log:
Implement sub-protocol selection

Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1245245&r1=1245244&r2=1245245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Thu 
Feb 16 23:16:40 2012
@@ -19,6 +19,7 @@ package org.apache.catalina.websocket;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -68,17 +69,17 @@ public abstract class WebSocketServlet e
 String subProtocol = null;
 List extensions = Collections.emptyList();
 
-if (!headerContains(req, "upgrade", "websocket")) {
+if (!headerContainsToken(req, "upgrade", "websocket")) {
 resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return;
 }
 
-if (!headerContains(req, "connection", "upgrade")) {
+if (!headerContainsToken(req, "connection", "upgrade")) {
 resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return;
 }
 
-if (!headerContains(req, "sec-websocket-version", "13")) {
+if (!headerContainsToken(req, "sec-websocket-version", "13")) {
 resp.setStatus(426);
 resp.setHeader("Sec-WebSocket-Version", "13");
 return;
@@ -96,8 +97,14 @@ public abstract class WebSocketServlet e
 return;
 }
 
-// TODO Read client handshake - Sec-WebSocket-Protocol
-//  Sec-WebSocket-Extensions
+List subProtocols = getTokensFromHeader(req,
+"Sec-WebSocket-Protocol-Client");
+if (!subProtocols.isEmpty()) {
+subProtocol = selectSubProtocol(subProtocols);
+
+}
+
+// TODO Read client handshake - Sec-WebSocket-Extensions
 
 // TODO Extensions require the ability to specify something (API TBD)
 //  that can be passed to the Tomcat internals and process 
extension
@@ -108,27 +115,27 @@ public abstract class WebSocketServlet e
 resp.setHeader("connection", "upgrade");
 resp.setHeader("Sec-WebSocket-Accept", getWebSocketAccept(key));
 if (subProtocol != null) {
-// TODO
+resp.setHeader("Sec-WebSocket-Protocol", subProtocol);
 }
 if (!extensions.isEmpty()) {
 // TODO
 }
 
 // Small hack until the Servlet API provides a way to do this.
-StreamInbound inbound = createWebSocketInbound();
+StreamInbound inbound = createWebSocketInbound(subProtocol);
 ((RequestFacade) req).doUpgrade(inbound);
 }
 
 
-private boolean headerContains(HttpServletRequest req, String headerName,
-String target) {
+/*
+ * This only works for tokens. Quoted strings need more sophisticated
+ * parsing.
+ */
+private boolean headerContainsToken(HttpServletRequest req,
+String headerName, String target) {
 Enumeration headers = req.getHeaders(headerName);
 while (headers.hasMoreElements()) {
 String header = headers.nextElement();
-// TODO Splitting headers into tokens isn't quite this simple but
-//  this should be OK in this case. It is tempting to change 
the
-//  header parsing code so there is a one to one mapping 
between
-//  token and enumeration entry.
 String[] tokens = header.split(",");
 for (String token : tokens) {
 if (target.equalsIgnoreCase(token.trim())) {
@@ -140,6 +147,26 @@ public abstract class WebSocketServlet e
 }
 
 
+/*
+ * This only works for tokens. Quoted strings need more sophisticated
+ * parsing.
+ */
+private List getTokensFromHeader(HttpServletRequest req,
+String headerName) {
+List result = new ArrayList();
+
+Enumeration headers = req.getHeaders(headerName);
+while (headers.hasMoreElements()) {
+String header = headers.nextElement();
+String[] tokens = header.split(",");
+for (String token : tokens) {
+result.add(token.trim());
+

svn commit: r1245246 - in /tomcat/trunk: java/org/apache/catalina/websocket/StreamInbound.java webapps/examples/WEB-INF/classes/websocket/EchoStream.java

2012-02-16 Thread markt
Author: markt
Date: Thu Feb 16 23:18:30 2012
New Revision: 1245246

URL: http://svn.apache.org/viewvc?rev=1245246&view=rev
Log:
Rename

Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1245246&r1=1245245&r2=1245246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Thu Feb 
16 23:18:30 2012
@@ -56,7 +56,7 @@ public abstract class StreamInbound impl
 this.processor = processor;
 }
 
-public WsOutbound getStreamOutbound() {
+public WsOutbound getOutbound() {
 return outbound;
 }
 

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java?rev=1245246&r1=1245245&r2=1245246&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java Thu 
Feb 16 23:18:30 2012
@@ -39,7 +39,7 @@ public class EchoStream extends WebSocke
 @Override
 protected void onBinaryData(InputStream is) throws IOException {
 // Simply echo the data to back to the client.
-WsOutbound outbound = getStreamOutbound();
+WsOutbound outbound = getOutbound();
 
 int i = is.read();
 while (i != -1) {
@@ -53,7 +53,7 @@ public class EchoStream extends WebSocke
 @Override
 protected void onTextData(Reader r) throws IOException {
 // Simply echo the data to back to the client.
-WsOutbound outbound = getStreamOutbound();
+WsOutbound outbound = getOutbound();
 
 int c = r.read();
 while (c != -1) {



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



svn commit: r1245247 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java

2012-02-16 Thread markt
Author: markt
Date: Thu Feb 16 23:19:10 2012
New Revision: 1245247

URL: http://svn.apache.org/viewvc?rev=1245247&view=rev
Log:
Slightly improve example

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java?rev=1245247&r1=1245246&r2=1245247&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java 
Thu Feb 16 23:19:10 2012
@@ -38,13 +38,14 @@ public class EchoMessage extends WebSock
 
 @Override
 protected void onBinaryMessage(ByteBuffer message) throws IOException {
-System.out.write(message.array(), 0, message.limit());
-System.out.print('\n');
+message.position(message.limit());
+getOutbound().writeBinaryMessage(message);
 }
 
 @Override
 protected void onTextMessage(CharBuffer message) throws IOException {
-System.out.println(message);
+message.position(message.limit());
+getOutbound().writeTextMessage(message);
 }
 }
 }



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



DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #38 from Mark Thomas  2012-02-16 23:30:35 UTC ---
I am extremely reluctant to apply the current fragmentation patch. It relies on
buffering individual fragments and - given the maximum fragment size - that is
simply not going to scale. This is why the current API is built on streams and
does not buffer unless the message based API is used.

I'd like to fully explore the possibility of supporting fragments without using
buffering before starting down that path.

The patch includes other fixes and refactorings. I'll take a look at those next
- probably in the next few days.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52688] Added ability to have access logs output to standard logging mechanism

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52688

--- Comment #2 from Konstantin Kolinko  2012-02-17 
00:16:04 UTC ---
You can always create your own class that inherits from AccessLogValve() and
overrides
- open()
- close()
- log(String)

I think it could be possible to refactor AccessLogValve to extract output file
handling into helper class. Redirection to a logger might be an alternative
implementation of such helper.

I see the following weaknesses of proposed patch:

1. It does not prevent creation of access log files by the valve. It just
prints nothing to them, but the files will be created as usual.

2. Those "Fields/Version/Software" headers are specific to
ExtendedAccessLogValve, because they are part of "W3c Extended Log File Format"
format that it implements.
They are not needed in AccessLogValve. If you want to add them there, it would
be a separate feature.


For reference - see discussion on dev@ regarding viability of this approach,
"AccessLogValve enhancement"
- http://marc.info/?t=13293412385&r=1&w=2
- http://tomcat.markmail.org/thread/iz67c2puilxv4leg

Note that using this feature requires specific logging configuration.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: svn commit: r1244737 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

2012-02-16 Thread Konstantin Kolinko
2012/2/16  :
> Author: markt
> Date: Wed Feb 15 21:22:19 2012
> New Revision: 1244737
>
> URL: http://svn.apache.org/viewvc?rev=1244737&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52669
> Correct regression introduced by the invalid assumptions made in the
> hack for Eclipse to address
> https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
>
> Modified:
>    tomcat/tc7.0.x/trunk/   (props changed)
>    tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
>    
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
>    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>

> -contextConfig.webinfClassesUrl=Unable to determine URL for WEB-INF/classes
> +contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]

There is one glitch with the above log message change.  The message is
used in several places. The old places were not updated to provide
value for the added parameter. I mean:

1259 } catch (NamingException e) {
1260 log.error(sm.getString(
1261 "contextConfig.webinfClassesUrl"), e);
1262 }

Best regards,
Konstantin Kolinko

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



DO NOT REPLY [Bug 52671] NIO Connector: Exception invoking method readBufSize / writeBufSize in the JMX Proxy Servlet

2012-02-16 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52671

--- Comment #2 from Konstantin Kolinko  2012-02-17 
00:44:47 UTC ---
For reference:
The NPE was thrown from the following code in SocketProperties, where Integer
txBufSize is null:

public int getTxBufSize() {
return txBufSize.intValue();
}

MBeanDumper#dumpBeans() skips null values. It is OK to skip such NPEs as well.
The fix in 7.0.26 is r1244746

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1245274 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Fri Feb 17 00:49:08 2012
New Revision: 1245274

URL: http://svn.apache.org/viewvc?rev=1245274&view=rev
Log:
Skip debug call if debugging is not enabled.

Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1245274&r1=1245273&r2=1245274&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Fri Feb 17 
00:49:08 2012
@@ -83,11 +83,15 @@ public class MBeanDumper {
 } catch (JMRuntimeException rme) {
 Throwable cause = rme.getCause();
 if (cause instanceof UnsupportedOperationException) {
-log.debug("Error getting attribute " + oname +
-" " + attName, rme);
+if (log.isDebugEnabled()) {
+log.debug("Error getting attribute " + oname
++ " " + attName, rme);
+}
 } else if (cause instanceof NullPointerException) {
-log.debug("Error getting attribute " + oname +
-" " + attName, rme);
+if (log.isDebugEnabled()) {
+log.debug("Error getting attribute " + oname
++ " " + attName, rme);
+}
 } else {
 log.error("Error getting attribute " + oname +
 " " + attName, rme);



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



svn commit: r1245275 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanDumper.java

2012-02-16 Thread kkolinko
Author: kkolinko
Date: Fri Feb 17 00:51:26 2012
New Revision: 1245275

URL: http://svn.apache.org/viewvc?rev=1245275&view=rev
Log:
Merged revision 1245274 from tomcat/trunk:
Skip debug call if debug logging is not enabled.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 17 00:51:26 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,123913

Re: svn commit: r1243655 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/interceptor/ test/java/org/apache/tomcat/jdbc/bugs/ test/java/org/apache/tomcat/jdbc/pool/inter

2012-02-16 Thread Konstantin Kolinko
2012/2/13  :
> Author: fhanik
> Date: Mon Feb 13 19:07:30 2012
> New Revision: 1243655
>
> URL: http://svn.apache.org/viewvc?rev=1243655&view=rev
> Log:
> Fix for
> https://issues.apache.org/bugzilla/show_bug.cgi?id=51582
>
>
>
> Added:
>    tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/
>    
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
>    
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/InduceSlowQuery.java
> Modified:
>    
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

> +public class InduceSlowQuery extends AbstractQueryReport {
> +    public static SecureRandom random = new SecureRandom();

It is a test class.  I do not see why it should rely on SecureRandom.
Just a Random should be enough.

BTW, s/static/static final/

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-eoln (in module tomcat-7.0.x) failed

2012-02-16 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-tc7.0.x-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
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-eoln :  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-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 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 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/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-17022012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-
 dbcp-17022012.jar validate-eoln 
[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/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-17022012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-17022012.jar
-
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz

downloadfile-2:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for /srv/gump/public/workspace/commons-pool-1.x/build.xml

downloadgz-2:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for /srv/gump/public/workspace/commons-dbcp-1.x/build.xml

downloadgz-2:

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

build-manifests:

build-tomcat-dbcp:

testexist:
 [echo] Testing  for 
/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar

downloadfile-2:

compile-prepare:

download-validate:

validate:

compile:

validate-eoln:

BUILD FAILED
/srv/gump/public/workspace/tomcat-7.0.x/build.xml:492: taskdef class 
org.apache.tomcat.buildutil.CheckEol cannot be found
 using the classloader 
AntClassLoader[/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

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

2012-02-16 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-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
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-eoln :  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-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 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 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz
 -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-17022012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-
 dbcp-17022012.jar validate-eoln 
[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/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-17022012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-17022012.jar
-
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-17022012-native-src.tar.gz

downloadfile-2:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for /srv/gump/public/workspace/commons-pool-1.x/build.xml

downloadgz-2:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for /srv/gump/public/workspace/commons-dbcp-1.x/build.xml

downloadgz-2:

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

build-manifests:

build-tomcat-dbcp:

testexist:
 [echo] Testing  for 
/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar

downloadfile-2:

compile-prepare:

download-validate:

validate:

compile:

validate-eoln:

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:489: taskdef class 
org.apache.tomcat.buildutil.CheckEol cannot be found
 using the classloader 
AntClassLoader[/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/packages/eclips

svn commit: r1245329 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-02-16 Thread kfujino
Author: kfujino
Date: Fri Feb 17 07:10:51 2012
New Revision: 1245329

URL: http://svn.apache.org/viewvc?rev=1245329&view=rev
Log:
vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1245329&r1=1245328&r2=1245329&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 17 07:10:51 2012
@@ -87,7 +87,7 @@ PATCHES PROPOSED TO BACKPORT:
svn propset svn:eol-style native 
java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
   3) Add example of configuration to conf/web.xml:
http://svn.apache.org/viewvc?rev=1228210&view=rev
-  +1: kkolinko, rjung
+  +1: kkolinko, rjung, kfujino
   -1:
 
 * Reduce log level for the message about hitting maxParameterCount limit
@@ -95,7 +95,7 @@ PATCHES PROPOSED TO BACKPORT:
   triggers this message.
   
http://people.apache.org/~kkolinko/patches/2012-01-16_tc6_Parameters_maxCountFail.patch
   (backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
-  +1: kkolinko, rjung
+  +1: kkolinko, rjung, kfujino
   -1:
 
 * Improvements to Windows installer:
@@ -125,19 +125,19 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606
   Ensure replayed POST bodies are available when using AJP
   http://svn.apache.org/viewvc?rev=1241985&view=rev
-  +1: markt
+  +1: markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52548
   Upgrade to Commons Daemon 1.0.9
   http://svn.apache.org/viewvc?rev=1244519&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52666
   Correct coercion order in EL for A {==,!=,eq,ne} B
   http://svn.apache.org/viewvc?rev=1244567&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:
 
 



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



svn commit: r1245330 - /tomcat/tc5.5.x/trunk/STATUS.txt

2012-02-16 Thread kfujino
Author: kfujino
Date: Fri Feb 17 07:13:10 2012
New Revision: 1245330

URL: http://svn.apache.org/viewvc?rev=1245330&view=rev
Log:
vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1245330&r1=1245329&r2=1245330&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Feb 17 07:13:10 2012
@@ -38,11 +38,11 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Upgrade to Commons Daemon 1.0.9
   http://svn.apache.org/viewvc?rev=1244511&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52640
   Correct endorsed dir location when using installer
   http://people.apache.org/~markt/patches/2012-02-15-bug52640-tc5.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:



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