Re: Tagging 7.0.23

2011-11-02 Thread markt
Konstantin Kolinko  wrote:

>2011/11/2 Mark Thomas :
>> On 01/11/2011 22:39, Mark Thomas wrote:

>> My first stab at a patch for this is at [1]. Comments welcome.

>>http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch


>Quick review - several typos:
>
>mbeans-descriptors.xml:
>- typo "findRedployResources"
>- "Path to the resource, relative to docBase" - It is "either absolute
>or relative to docBase".
>
>docs: s/if is is updated/if it is updated/

I'll get those fixed for the next iteration.

>At first view I was hesitant wrt to new syntax in conf/context.xml
>(s/// but I am starting to like it.
>
>Need to apply and play with it a while.

Fair enough 

>I do not see though how it is related to another/main topic of
>http://markmail.org/message/5k4urwimvvmeqees
>that is: if context.xml startup fails somehow the webapp continues
>with the deploying the expanded dir.
>
>I observed it during startup time, not during redeployment:
>
>To reproduce, create conf/Catalina/localhost/host-manager.xml:

Ah. I think I misunderstood what you meant by this in the original message. I 
can see how this happens. Not sure on how to fix it yet.

Mark





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



Re: svn commit: r1196077 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

2011-11-02 Thread Mladen Truk

On 11/01/2011 06:48 PM, Konstantin Kolinko wrote:

2011/11/1:


--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:07:10 2011
@@ -2817,6 +2816,8 @@ static BOOL initialize_extension(void)
 if (read_registry_init_data()) {
 if (get_iis_info(&iis_info) != JK_TRUE) {
 jk_log(logger, JK_LOG_ERROR, "Could not retrieve IIS version from 
registry");
+}
+else {
 if (use_auth_notification_flags)
 iis_info.filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
 else


You not only axed the whitespace, but also added the above "else" into
initialize_extension(void) method.



Right. This should have been a separate commit message,
but the committed implementation is correct.

If the IIS version cannot be read from registry, load must fail.


Regards
--
^TM

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



svn commit: r1196544 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/

2011-11-02 Thread olamy
Author: olamy
Date: Wed Nov  2 11:30:23 2011
New Revision: 1196544

URL: http://svn.apache.org/viewvc?rev=1196544&view=rev
Log:
fix warSourceDirectory expression/default-value

Modified:

tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java

Modified: 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1196544&r1=1196543&r2=1196544&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
 Wed Nov  2 11:30:23 2011
@@ -71,7 +71,7 @@ public class RunMojo
 /**
  * The web resources directory for the web application being run.
  *
- * @parameter expression="${basedir}/src/main/webapp"
+ * @parameter default-value="${basedir}/src/main/webapp" expression = 
"${tomcat.warSourceDirectory}"
  */
 private File warSourceDirectory;
 

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1196544&r1=1196543&r2=1196544&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
 Wed Nov  2 11:30:23 2011
@@ -67,7 +67,7 @@ public class RunMojo
 /**
  * The web resources directory for the web application being run.
  *
- * @parameter expression="${basedir}/src/main/webapp"
+ * @parameter default-value="${basedir}/src/main/webapp" expression = 
"${tomcat.warSourceDirectory}"
  */
 private File warSourceDirectory;
 



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



DO NOT REPLY [Bug 52124] New: Tomcat Maven metadata only includes the latest release

2011-11-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52124

 Bug #: 52124
   Summary: Tomcat Maven metadata only includes the latest release
   Product: Tomcat 6
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: bdem...@apache.org
Classification: Unclassified


See: https://issues.sonatype.org/browse/MVNCENTRAL-139

The content from:
people:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tomcat/catalina
is synchronized to central.

One solution would be to deploy releases to repository.apache.org:
http://www.apache.org/dev/publishing-maven-artifacts.html

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



Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-02 Thread Konstantin Kolinko
2011/11/2  :
> Konstantin Kolinko  wrote:
>
>>2011/11/2 Mark Thomas :
>>> On 01/11/2011 22:39, Mark Thomas wrote:
>
>>> My first stab at a patch for this is at [1]. Comments welcome.
>
>>>http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch
>
>
>>Quick review - several typos:
>>
>>mbeans-descriptors.xml:
>>- typo "findRedployResources"
>>- "Path to the resource, relative to docBase" - It is "either absolute
>>or relative to docBase".
>>
>>docs: s/if is is updated/if it is updated/
>
> I'll get those fixed for the next iteration.

Also s/redploy/redeploy/ in some Javadoc.

The removeWatchedResource() method in the patch is NOOP instead of
calling renamed method.

The following in StandardContext.java does not look backwards-compatible:
-fireContainerEvent("addWatchedResource", name);
+fireContainerEvent("addReloadResource", name);
and
- fireContainerEvent("removeWatchedResource", name);
+fireContainerEvent("removeReloadResource", name);

Better keep the old name of "watched" and just add the new one of "redeploy".
In all places the "redeploy" list is new and parallel to the old "watched" one.

The only place where meaning changes is
HostConfig#addWatchedResources() that now processes both types.

> The one thing I don't like is that a change to conf/context.xml that
> breaks the file effectively kills the instance until the problem is
> fixed and the instance re-started.

Looking at HostConfig.checkResources(DeployedApplication) note several
ExpandWar.delete() calls. The order is important there. If redeploy
resource #i is missing or updated it deletes all following redeploy
resources starting with #(i+1).

With this behaviour it is better not to let a user to control this
"redeploy" list.

BTW, checkResources(DeployedApplication) deletes reload resources on
auto-undeploy as well, but first checks their path.


Regarding the original task of what happens when context.xml is
touched or edited:  redeploying deletes the work dir, along with all
persisted sessions and all compiled JSPs. (ContextConfig.destroy()
triggered by Host.removeChild() does the deletion)

It is an enormous price to pay for editing an AccessLogValve
configuration or whatever is important in context.xml. I'd prefer a
solution that does not delete the work dir.

Best regards,
Konstantin Kolinko

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



svn commit: r1196735 - /tomcat/trunk/RUNNING.txt

2011-11-02 Thread kkolinko
Author: kkolinko
Date: Wed Nov  2 18:22:14 2011
New Revision: 1196735

URL: http://svn.apache.org/viewvc?rev=1196735&view=rev
Log:
Further improve RUNNING.txt
Better describe environment variables.
Document setenv.sh.
Provide examples of setenv files and of using a context that points to 
${catalina.home}.
Replace Netscape browser instructions with Firefox ones.

Modified:
tomcat/trunk/RUNNING.txt

Modified: tomcat/trunk/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=1196735&r1=1196734&r2=1196735&view=diff
==
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Wed Nov  2 18:22:14 2011
@@ -37,66 +37,125 @@ Running With JRE 6.0 Or Later
 (1.2) Install the JRE according to the instructions included with the
   release.
 
-(1.3) Set an environment variable named JRE_HOME to the pathname of
-  the directory into which you installed the JRE, e.g. c:\jre6.0
-  or /usr/local/java/jre6.0.
-
-NOTE: You may also use the full JDK rather than just the JRE. In this
-  case set your JAVA_HOME environment variable to the pathname of
-  the directory into which you installed the JDK, e.g. c:\jdk6.0
-  or /usr/local/java/jdk6.0.
+  You may also use the full JDK rather than just the JRE. In this
+  case set you have to configure your environment variables
+  differently - see below.
 
 
 (2) Download and Install the Tomcat Binary Distribution
 
-NOTE:  As an alternative to downloading a binary distribution, you can create
-your own from the Tomcat source repository, as described in "BUILDING.txt".
-If you do this, the value to use for "${catalina.home}" will be the "dist"
-subdirectory of your source distribution.
-
 (2.1) Download a binary distribution of Tomcat from:
 
   http://tomcat.apache.org/
 
 (2.2) Unpack the binary distribution into a convenient location so that the
   distribution resides in its own directory (conventionally named
-  "apache-tomcat-[version]").  For the purposes of the remainder of this 
document,
-  the symbolic name "$CATALINA_HOME" is used to refer to the full
-  pathname of the release directory.
+  "apache-tomcat-[version]").
+
+  For the purposes of the remainder of this document, the name
+  "CATALINA_HOME" is used to refer to the full pathname of the release
+  directory.
+
+NOTE:  As an alternative to downloading a binary distribution, you can
+create your own from the Tomcat source code, as described in
+"BUILDING.txt".  You can either
+
+  a)  Do the full "release" build and find the created distributive in the
+  "output/release" directory and then proceed with unpacking as above, or
+
+  b)  Do a simple build and use the "output/build" directory as
+  "CATALINA_HOME".  Be warned that there are some differences between
+  contents of "output/build" and the official "release" distributive.
+
+
+(3) Configure Environment Variables
+
+Tomcat itself is a Java application and does not use environment variables,
+but the startup scripts use them to prepare the command that starts Tomcat.
+The full list of supported environment variables is provided as a comment
+at the top of catalina.bat (Windows) and catalina.sh (Unix) files.
+
+(3.1) CATALINA_HOME and CATALINA_BASE
+
+The CATALINA_HOME and CATALINA_BASE environment variables are used to
+specify location of Tomcat itself and of its active configuration
+respectively.
+
+The CATALINA_HOME environment variable should be set as defined in (2.2)
+above. The startup scripts have some logic to set this variable
+automatically if it is absent (based on the location of the script in
+Unixes and on the current directory in Windows), but it might be not
+perfect.
+
+The CATALINA_BASE environment variable is optional and is further described
+in "Multiple Tomcat Instances" section below. If it is not set it defaults
+to be equal to CATALINA_HOME.
+
+(3.2) JRE_HOME and other variables
+
+The third and the last environment variable that is needed to start Tomcat
+specifies location of JRE or JDK that should be used to start Tomcat.
+
+There are two different names of this variable, depending on whether JRE or
+JDK is used. Use the JRE_HOME variable to specify location of a JRE and
+JAVA_HOME variable to specify location of a JDK.
 
-NOTE: The scripts expect that the $CATALINA_HOME environment variable is
-either set to the correct value, as defined above, or is absent. In the
-latter case the scripts will try to calculate the value for $CATALINA_HOME
-by themselves.
+All variables except CATALINA_HOME and CATALINA_BASE can be configured in a
+setenv.bat (Windows) or setenv.sh (Unix) file. The setenv file can be either
+in CATALINA_BASE/bin or in CATALINA_HOME/bin. If both are present, only the
+one in CATALINA_BASE is used.
 
+So, either set JRE_HOME variable by yourselves or create the file. For
+example,
 
-(3) Start Up Tomcat
+On Windows, %C

svn commit: r1196746 - in /tomcat/tc7.0.x/trunk: ./ RUNNING.txt webapps/docs/changelog.xml

2011-11-02 Thread kkolinko
Author: kkolinko
Date: Wed Nov  2 18:31:50 2011
New Revision: 1196746

URL: http://svn.apache.org/viewvc?rev=1196746&view=rev
Log:
Merged revisions r1175798 r1196735 from tomcat/trunk:
Improve RUNNING.txt:
- Better describe environment variables.
- Document setenv scripts.
- Mention "catalina start"/"catalina stop" as well as "startup"/"shutdown" 
scripts.
- Better document running with separate CATALINA_BASE and CATALINA_HOME.
- Provide example of setenv files and example of using a context that points to 
${catalina.home}.
- Replace Netscape browser instructions with Firefox ones.
- Add several references to User Guide and Configuration Reference.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  2 18:31:50 2011
@@ -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,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,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,1187381,1187755,1187
 
775,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
+/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,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,

svn commit: r1196769 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2011-11-02 Thread kkolinko
Author: kkolinko
Date: Wed Nov  2 19:21:09 2011
New Revision: 1196769

URL: http://svn.apache.org/viewvc?rev=1196769&view=rev
Log:
CTR: docs
Convert the changelog file to UTF-8.
The changelog files in trunk and TC7 are already UTF-8.
Fix characters that were broken by r83 about a year ago.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1196769&r1=1196768&r2=1196769&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov  2 19:21:09 2011
@@ -1,4 +1,4 @@
-
+
 

svn commit: r1196825 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

2011-11-02 Thread kkolinko
Author: kkolinko
Date: Wed Nov  2 22:03:51 2011
New Revision: 1196825

URL: http://svn.apache.org/viewvc?rev=1196825&view=rev
Log:
Wrap and format a long line. No functional change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1196825&r1=1196824&r2=1196825&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Nov  2 
22:03:51 2011
@@ -1055,7 +1055,14 @@ public class NioEndpoint extends Abstrac
 "endpoint.debug.socketCloseFail"), e);
 }
 }
-try {if (ka!=null && ka.getSendfileData()!=null && 
ka.getSendfileData().fchannel!=null && ka.getSendfileData().fchannel.isOpen()) 
ka.getSendfileData().fchannel.close();}catch (Exception ignore){}
+try {
+if (ka != null && ka.getSendfileData() != null
+&& ka.getSendfileData().fchannel != null
+&& ka.getSendfileData().fchannel.isOpen()) {
+ka.getSendfileData().fchannel.close();
+}
+} catch (Exception ignore) {
+}
 if (ka!=null) {
 ka.reset();
 countDownConnection();



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



svn commit: r1196827 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

2011-11-02 Thread kkolinko
Author: kkolinko
Date: Wed Nov  2 22:09:42 2011
New Revision: 1196827

URL: http://svn.apache.org/viewvc?rev=1196827&view=rev
Log:
Wrap and format long lines. No functional change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1196827&r1=1196826&r2=1196827&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Nov  2 
22:09:42 2011
@@ -564,7 +564,10 @@ public class NioEndpoint extends Abstrac
 pollers[i].destroy();
 pollers[i] = null;
 }
-try { stopLatch.await(selectorTimeout+100,TimeUnit.MILLISECONDS); 
} catch (InterruptedException ignore ) {}
+try {
+stopLatch.await(selectorTimeout + 100, TimeUnit.MILLISECONDS);
+} catch (InterruptedException ignore) {
+}
 }
 eventCache.clear();
 keyCache.clear();
@@ -1272,7 +1275,10 @@ public class NioEndpoint extends Abstrac
 log.debug("Send file complete for:"+sd.fileName);
 }
 attachment.setSendfileData(null);
-try {sd.fchannel.close();}catch(Exception ignore){}
+try {
+sd.fchannel.close();
+} catch (Exception ignore) {
+}
 if ( sd.keepAlive ) {
 if (reg) {
 if (log.isDebugEnabled()) {
@@ -1409,9 +1415,23 @@ public class NioEndpoint extends Abstrac
 error = false;
 lastRegistered = 0;
 sendfileData = null;
-if ( readLatch!=null ) try {for (int i=0; 
i<(int)readLatch.getCount();i++) readLatch.countDown();}catch (Exception 
ignore){}
+if (readLatch != null) {
+try {
+for (int i = 0; i < (int) readLatch.getCount(); i++) {
+readLatch.countDown();
+}
+} catch (Exception ignore) {
+}
+}
 readLatch = null;
-if ( writeLatch!=null ) try {for (int i=0; 
i<(int)writeLatch.getCount();i++) writeLatch.countDown();}catch (Exception 
ignore){}
+if (writeLatch != null) {
+try {
+for (int i = 0; i < (int) writeLatch.getCount(); i++) {
+writeLatch.countDown();
+}
+} catch (Exception ignore) {
+}
+}
 writeLatch = null;
 cometNotify = false;
 cometOps = SelectionKey.OP_READ;



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



buildbot failure in ASF Buildbot on tomcat-trunk

2011-11-02 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2453

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1196825
Blamelist: kkolinko

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





Re: buildbot failure in ASF Buildbot on tomcat-trunk

2011-11-02 Thread Konstantin Kolinko
2011/11/3  :
> The Buildbot has detected a new failure on builder tomcat-trunk while 
> building ASF Buildbot.
> Full details are available at:
>  http://ci.apache.org/builders/tomcat-trunk/builds/2453

Some ~random test failure in TestNonBlockingCoordinator

[junit] Running
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator
(...)
[junit] Tests run: 2, Failures: 2, Errors: 0, Time elapsed: 37.608 sec
[junit] Test
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator
FAILED

It was first run (bio) and it failed with some timeouts.

The second run (nio) was successful and several times faster:
Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 8.673 sec

All other tests did run OK.

Best regards,
Konstantin Kolinko

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



buildbot success in ASF Buildbot on tomcat-trunk

2011-11-02 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2454

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1196827
Blamelist: kkolinko

Build succeeded!

sincerely,
 -The Buildbot





[patch] Speed up Tomcat shutdown during test runs

2011-11-02 Thread Konstantin Kolinko
Hi!

The patch:
http://people.apache.org/~kkolinko/patches/2011-11-03_tc8_fastShutdown.patch

It saves 1 second for each Tomcat shutdown during tests,
by skipping a sleep in AbstractEndpoint.pause().

I think it is worth doing, but maybe there are other comments?


All tests for one connector run about 11,5 minutes for me with this patch.

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 taglibs-parent (in module tomcat-taglibs) failed

2011-11-02 Thread Gump
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 taglibs-parent has an issue affecting its community integration.
This issue affects 42 projects,
 and has been outstanding for 328 runs.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- commons-id :  Commons Identifier Package
- commons-jelly :  Commons Jelly
- commons-jelly-tags-ant :  Commons Jelly
- commons-jelly-tags-ant-test :  Commons Jelly
- commons-jelly-tags-antlr :  Commons Jelly
- commons-jelly-tags-avalon :  Commons Jelly
- commons-jelly-tags-bean :  Commons Jelly
- commons-jelly-tags-beanshell :  Commons Jelly
- commons-jelly-tags-betwixt :  Commons Jelly
- commons-jelly-tags-bsf :  Commons Jelly
- commons-jelly-tags-define :  Commons Jelly
- commons-jelly-tags-define-test :  Commons Jelly
- commons-jelly-tags-dynabean :  Commons Jelly
- commons-jelly-tags-email :  Commons Jelly
- commons-jelly-tags-fmt :  Commons Jelly
- commons-jelly-tags-fmt-test :  Commons Jelly
- commons-jelly-tags-html :  Commons Jelly
- commons-jelly-tags-http :  Commons Jelly
- commons-jelly-tags-interaction :  Commons Jelly
- commons-jelly-tags-jface :  Commons Jelly
- commons-jelly-tags-jms :  Commons Jelly
- commons-jelly-tags-jmx :  Commons Jelly
- commons-jelly-tags-jsl :  Commons Jelly
- commons-jelly-tags-jsl-test :  Commons Jelly
- commons-jelly-tags-junit :  Commons Jelly
- commons-jelly-tags-log :  Commons Jelly
- commons-jelly-tags-memory :  Commons Jelly
- commons-jelly-tags-regexp :  Commons Jelly
- commons-jelly-tags-soap :  Commons Jelly
- commons-jelly-tags-sql :  Commons Jelly
- commons-jelly-tags-swing :  Commons Jelly
- commons-jelly-tags-swt :  Commons Jelly
- commons-jelly-tags-threads :  Commons Jelly
- commons-jelly-tags-util :  Commons Jelly
- commons-jelly-tags-velocity :  Commons Jelly
- commons-jelly-tags-xml :  Commons Jelly
- commons-jelly-tags-xmlunit :  Commons Jelly
- commons-jelly-test :  Commons Jelly
- taglibs-parent :  Taglib Parent POM
- taglibs-standard-spec :  JSP Taglibs
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Sole pom output [pom.xml] identifier set to project name
 -INFO- Optional dependency doxia-site-renderer failed with reason build timed 
out
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml
 -INFO- Failed with reason build timed out
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/gump_work/build_tomcat-taglibs_taglibs-parent.html
Work Name: build_tomcat-taglibs_taglibs-parent (Type: Build)
Work ended in a state of : Failed
Elapsed: 60 mins
Command Line: /opt/maven2/bin/mvn --batch-mode --settings 
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent]
M2_HOME: /opt/maven2
-
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache Taglibs Parent
[INFO]task-segment: [install]
[INFO] 
Downloading: 
http://localhost:8192/maven2/org/apache/maven/plugins/maven-site-plugin/2.2/maven-site-plugin-2.2.pom
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 05000602112011, vmgump.apache.org:vmgump:05000602112011
Gump E-mail Identifier (unique within run) #35.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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



DO NOT REPLY [Bug 52127] New: java.lang.IncompatibleClassChangeError

2011-11-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52127

 Bug #: 52127
   Summary: java.lang.IncompatibleClassChangeError
   Product: Tomcat 6
   Version: 6.0.32
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kevinser...@sina.com
Classification: Unclassified


Run application in tomcat 6.0.32, it works well. And suddenly, found
application cannot be accessed. Check tomcat log and found:

Aug 30, 2011 9:57:16 AM org.apache.catalina.core.StandardWrapperValve invoke
SEVERE: Servlet.service() for servlet RPCAdapter threw exception
Throwable occurred: java.lang.IncompatibleClassChangeError
at
javax.servlet.ServletRequestWrapper.getRemoteAddr(ServletRequestWrapper.java:260)
at
javax.servlet.ServletRequestWrapper.getRemoteAddr(ServletRequestWrapper.java:260)
at com.ibm.svc.gui.util.ServletUtils.getIpAddress(ServletUtils.java:83)
at
com.ibm.svc.gui.util.security.ActiveUserManager.update(ActiveUserManager.java:111)
at
com.ibm.svc.gui.servlets.filters.ServletFilter.doFilter(ServletFilter.java:94)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:563)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:298)
at
org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:859)
at
org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:588)
at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:489)
at java.lang.Thread.run(Thread.java:736)

After restart tomcat, application back to normal. 

Is it a tomcat defect?

-- 
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-105) creating executable war failed

2011-11-02 Thread albert kam (Created) (JIRA)
creating executable war failed
--

 Key: MTOMCAT-105
 URL: https://issues.apache.org/jira/browse/MTOMCAT-105
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.0
 Environment: C:\Users\albert\workspace\BasicSetup>mvn --version
Apache Maven 3.0.3 (r1075438; 2011-03-01 00:31:09+0700)
Maven home: C:\Users\albert\Desktop\myapps\apache-maven-3.0.3\bin\..
Java version: 1.7.0, vendor: Oracle Corporation
Java home: C:\Program Files\Java\jdk1.7.0\jre
Default locale: en_US, platform encoding: Cp1252
OS name: "windows 7", version: "6.1", arch: "x86", family: "windows"
Reporter: albert kam
Assignee: Olivier Lamy
Priority: Critical
 Fix For: 2.0


Just today on November 3rd, i tried out the tomcat7 maven plugin to try out the 
executable war.
Following the configuration from the 
http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html, 
here's the output of my tomcat7:exec-war-only -X :

... lot of lines removed ...

org.codehaus.plexus:plexus-archiver:jar:2.0.1:compile, 
junit:junit:jar:4.9:compile, org.hamcrest:hamcrest-core:jar:1.1:compile, 
org.codehaus.plexus:plexus-io:jar:2.0.1:compile]
[DEBUG]   (f) project = MavenProject: 
kam.albert.study:BasicSetup:0.0.1-SNAPSHOT @ 
C:\Users\albert\workspace\BasicSetup\pom.xml
[DEBUG]   (f) projectArtifact = kam.albert.study:BasicSetup:war:0.0.1-SNAPSHOT
[DEBUG]   (f) remoteRepos = [   id: jvnet-nexus-releases
  url: https://maven.java.net/content/repositories/releases/
   layout: default
snapshots: [enabled => true, update => daily]
 releases: [enabled => true, update => daily]
,id: central
  url: http://repo1.maven.org/maven2
   layout: default
snapshots: [enabled => false, update => daily]
 releases: [enabled => true, update => daily]
]
[DEBUG]   (f) serverXml = 
C:\Users\albert\workspace\BasicSetup\src\main\tomcatconf\server.xml
[DEBUG]   (f) tomcatConfigurationFilesDirectory = 
C:\Users\albert\workspace\BasicSetup\src\main\tomcatconf
[DEBUG] -- end configuration --
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 0.827s
[INFO] Finished at: Thu Nov 03 13:06:40 ICT 2011
[INFO] Final Memory: 6M/15M
[INFO] 
[ERROR] Failed to execute goal 
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-SNAPSHOT:exec-war-only 
(default-cli) on project BasicSetup: Execution default-cli of goal 
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-SNAPSHOT:exec-war-only failed. 
NullPointerException -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal 
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-SNAPSHOT:exec-war-only 
(default-cli) on project BasicSetup: Execution default-cli of goal 
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-SNAPSHOT:exec-war-only failed.
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:225)
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at 
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at 
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at 
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at 
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at 
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.plugin.PluginExecutionException: Execution 
default-cli of goal 
org.apache.tomcat.maven:tomcat7-ma