DO NOT REPLY [Bug 51743] New: Allow using of rule extension when using handler with mod_rewrite

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51743

 Bug #: 51743
   Summary: Allow using of rule extension when using handler with
mod_rewrite
   Product: Tomcat Connectors
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: ryl...@gmail.com
Classification: Unclassified


Hi.

It is currently not possible to use rule extension with handlers and e.g.
mod_rewrite. The rule

RewriteRule .*\.xml$ -
[H=jakarta-servlet,E=JK_WORKER_NAME:lb;use_server_errors=404,L]

Causes an error

[info] jk_handler::mod_jk.c (2623): Could not find a worker for worker
name=lb;use_server_errors=404

It would be nice to be able to set a rule extension in an JK_WORKER_NAME value.

Cheers,

Ryszard.

-- 
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: [VOTE] Release Apache Tomcat 7.0.21

2011-08-30 Thread Mark Thomas 
On 29/08/2011 22:01, Mark Thomas wrote:
> The proposed Apache Tomcat 7.0.21 release is now available for voting.
> 
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.21/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_21/
> 
> The proposed 7.0.21 release is:
> 
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 7.0.21 Alpha
> [ ] Beta   - go ahead and release as 7.0.21 Beta
> [X] Stable - go ahead and release as 7.0.21 Stable

Unit tests on 64-bit Windows

EL TCK passes on 64-bit Linux

JSP TCK passes with BIO HTTP connector on 64-bit linux

Servlet TCL passes on 64-bit Linux with:
- direct access to BIO, NIO & APR HTTP connectors
- mod_proxy_http with BIO, NIO & APR HTTP connectors
- mod_proxy_ajp with BIO, NIO & APR AJP connectors
- mod_jk with BIO, NIO & APR AJP connectors

Mark

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

svn commit: r1163132 - in /tomcat/maven-plugin: ./ trunk/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 08:23:49 2011
New Revision: 1163132

URL: http://svn.apache.org/viewvc?rev=1163132&view=rev
Log:
create maven-plugin svn layout


Added:
tomcat/maven-plugin/
tomcat/maven-plugin/trunk/


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

svn commit: r1163133 - /tomcat/maven-plugin/tags/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 08:24:14 2011
New Revision: 1163133

URL: http://svn.apache.org/viewvc?rev=1163133&view=rev
Log:
create maven-plugin svn layout


Added:
tomcat/maven-plugin/tags/


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

svn commit: r1163134 - /tomcat/maven-plugin/branches/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 08:24:40 2011
New Revision: 1163134

URL: http://svn.apache.org/viewvc?rev=1163134&view=rev
Log:
create maven-plugin svn layout


Added:
tomcat/maven-plugin/branches/


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

svn commit: r1163136 [5/5] - in /tomcat/maven-plugin/trunk: ./ src/ src/site/ tomcat-maven-plugin-it/ tomcat-maven-plugin-it/src/ tomcat-maven-plugin-it/src/test/ tomcat-maven-plugin-it/src/test/java/

2011-08-30 Thread olamy 
Added: tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/usage.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/usage.apt.vm?rev=1163136&view=auto
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/usage.apt.vm 
(added)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/usage.apt.vm Tue 
Aug 30 08:31:33 2011
@@ -0,0 +1,183 @@
+ ---
+ Usage
+ ---
+ Mark Hobson
+ 
+ ---
+ 2010-03-09
+ ---
+
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Usage
+
+ If no explicit configuration is provided then the Tomcat Maven Plugin 
defaults to
+ the following:
+
+ * Tomcat manager URL of <<>>
+
+ * Authentication details of username <<>> and no password
+
+ * Context path of <<>>
+
+ []
+
+ These can be overridden as described below.
+
+* Using a different Tomcat manager URL
+
+ To configure the plugin for a different Tomcat instance, add a plugin
+ configuration block to your <<>> as follows:
+
++--
+
+  ...
+  
+...
+
+  ...
+  
+org.codehaus.mojo
+tomcat-maven-plugin
+${project.version}
+
+  http://www.mydomain.com:1234/mymanager
+
+  
+  ...
+
+...
+  
+  ...
+
++--
+
+ The default Tomcat manager URL is <<>>.
+
+* Using different Tomcat manager authentication details
+
+ To specify a different username and password to use when authenticating with
+ Tomcat manager:
+
+ [[1]] Add a plugin configuration block to your <<>>:
+
++--
+
+  ...
+  
+...
+
+  ...
+  
+org.codehaus.mojo
+tomcat-maven-plugin
+${project.version}
+
+  myserver
+
+  
+  ...
+
+...
+  
+  ...
+
++--
+
+ [[2]] Add a corresponding <<>> block to your <<>>:
+
++--
+
+  ...
+  
+...
+
+  myserver
+  myusername
+  mypassword
+
+...
+  
+  ...
+
++--
+
+ []
+
+ The default authentication details are username <<>> and no password.
+
+* Using a different context path
+
+ The default context path is <<>>.
+
+ To change the context path to <<>> configure the plugin like this:
+
++--
+
+  ...
+  
+...
+
+  ...
+  
+org.codehaus.mojo
+tomcat-maven-plugin
+${project.version}
+
+  /mycontext
+
+  
+  ...
+
+...
+  
+  ...
+
++--
+
+ If you are using <<>> to change the name of your WAR
+ file, you can use that value when you configure the context path as well. To 
do
+ that add the following configuration block to your <<>>:
+
++--
+
+  ...
+  
+...
+mycontext
+...
+
+  ...
+  
+org.codehaus.mojo
+tomcat-maven-plugin
+${project.version}
+
+  /\${project.build.finalName}
+
+  
+  ...
+
+...
+  
+  ...
+
++--

Added: tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/fml/faq.fml?rev=1163136&view=auto
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/fml/faq.fml (added)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/fml/faq.fml Tue Aug 
30 08:31:33 2011
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+   
+   
+   
+   
+   Why do I have to specify a war 
goal when running
+   tomcat:exploded or 
tomcat:inplace ?
+   
+   
+   Because there's currently no way for a goal to 
depend upon
+   another plugin's goal.  See
+   http://jira.codehaus.org/browse/MNG-1649";>MNG-1649
+   for more information.
+   
+   
+   
+   
+

DO NOT REPLY [Bug 51743] Allow using of rule extension when using handler with mod_rewrite

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51743

Ryszard Łach  changed:

   What|Removed |Added

 CC||ryl...@gmail.com

-- 
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: r1163139 - in /tomcat/maven-plugin/trunk: pom.xml tomcat-maven-plugin-it/pom.xml tomcat-maven-plugin/pom.xml

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 08:41:53 2011
New Revision: 1163139

URL: http://svn.apache.org/viewvc?rev=1163139&view=rev
Log:
change groupId to org.apache.tomcat.maven

Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1163139&r1=1163138&r2=1163139&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Aug 30 08:41:53 2011
@@ -21,18 +21,19 @@
 
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 
+  
   
-org.codehaus.mojo
-mojo-parent
-27
-../mojo-parent/pom.xml
+org.apache
+apache
+10
   
 
   4.0.0
+  org.apache.tomcat.maven
   tomcat-maven-plugin-parent
   pom
   Tomcat Maven Plugin Project
-  1.2-SNAPSHOT
+  2.0-SNAPSHOT
   The Tomcat Maven Plugin provides goals to manipulate WAR 
projects within the Tomcat servlet
 container.
   
@@ -69,16 +70,6 @@
   Olivier Lamy
   ol...@apache.org
 
-
-  thragor
-  Mark Michaelis
-  thra...@gmx.net
-  http://thragor.blogspot.com/
-  +2
-  
-Developer
-  
-
   
 
   
@@ -88,13 +79,15 @@
 
   Spike Washburn
 
+
+  Mark Michaelis
+
   
 
   
 
   The Apache Software License, Version 2.0
   http://www.apache.org/licenses/LICENSE-2.0.txt
-  repo
 
   
 

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1163139&r1=1163138&r2=1163139&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Tue Aug 30 
08:41:53 2011
@@ -23,8 +23,8 @@
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   
 tomcat-maven-plugin-parent
-org.codehaus.mojo
-1.2-SNAPSHOT
+org.apache.tomcat.maven
+2.0-SNAPSHOT
   
   4.0.0
 

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/pom.xml?rev=1163139&r1=1163138&r2=1163139&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin/pom.xml Tue Aug 30 08:41:53 
2011
@@ -20,9 +20,9 @@
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   
-org.codehaus.mojo
+org.apache.tomcat.maven
 tomcat-maven-plugin-parent
-1.2-SNAPSHOT
+2.0-SNAPSHOT
 ../pom.xml
   
 



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

svn commit: r1163140 - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-plugin-it/ tomcat-maven-plugin/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 08:43:19 2011
New Revision: 1163140

URL: http://svn.apache.org/viewvc?rev=1163140&view=rev
Log:
add basic svn:ignore

Modified:
tomcat/maven-plugin/trunk/   (props changed)
tomcat/maven-plugin/trunk/tomcat-maven-plugin/   (props changed)
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/   (props changed)

Propchange: tomcat/maven-plugin/trunk/
--
--- svn:ignore (added)
+++ svn:ignore Tue Aug 30 08:43:19 2011
@@ -0,0 +1,2 @@
+target
+*.iml

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-plugin/
--
--- svn:ignore (added)
+++ svn:ignore Tue Aug 30 08:43:19 2011
@@ -0,0 +1,2 @@
+target
+*.iml

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/
--
--- svn:ignore (added)
+++ svn:ignore Tue Aug 30 08:43:19 2011
@@ -0,0 +1,2 @@
+target
+*.iml



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

DO NOT REPLY [Bug 51744] New: JNDI Lookup Error after a Context is closed

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51744

 Bug #: 51744
   Summary: JNDI Lookup Error after a Context is closed
   Product: Tomcat 7
   Version: 7.0.14
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: laferna...@gmail.com
Classification: Unclassified


I was integrating Atomikos into Tomcat to register the transaction manager, and
the lookup for the transaction manager works fine in JNDI, unless someone else,
looks up a JNDI context and closes it. And subsequent calls to lookup the
transaction manager also fails saying java:comp is not found. I went through
the code and found the problem at "org.apache.naming.SelectorContext". When
methods of that class is calls, those are delegated to a Context received
through "getBoundContext()", which returns a "org.apache.naming.NamingContext"
object. And these are stored in a map in ContextBindings class. So the
getBoundContext checks this cache, and if it's found it returns it or else,
create a new object and store it and returns it. So the problem happens, if
someone calls "close()" in the NamingContext object. Then it's implemented in
the following way,

   public void close()
throws NamingException {
env.clear();
}

Which just clears the environment, but it doesn't in no way invalidate that
cache in the ContextBindings class to remove its entry. So in the next time
also when getBoundContext is called to get the same context, it will return the
earlier 'closed' context without creating a new one. And the environment it has
would be cleared and subsequent lookups done from that will fail. 

So I guess the proper fix would be to remove that context from ContextBinding's
cache when its close method is closed.

Cheers,
Anjana.

-- 
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 51744] JNDI Lookup Error after a Context is closed

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51744

Anjana Fernando  changed:

   What|Removed |Added

 CC||laferna...@gmail.com

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

[DISCUSS] Tomcat Maven Plugin plan

2011-08-30 Thread Olivier Lamy 
Hello,
I have started to import sources as defined in the ip clearance. (I
still have some java package to change : I will change to
org.apache.tomcat.maven.plugin as a base package)

My plan to improve the plugin is:

* add support of tomcat7 (tru a set of new mojos with a new name :
tomcat7:run etc... )
* create a new mojo which will create an executable war: users will be
able to package their war and launch it with a simple java -jar
mywar.war (I plan to use the embeder features from tomcat7).

Some tasks:

* Importing jira issues from codehaus (see [1] ). Let me know Mark if
you're fine with the proposal from codehaus folks or if you need a
real dump (btw I will create a jira @infra).
* asking setup of repository.apache.org to be able to deploy snaphots.
* Optional (but IMHO a nice to have): I see taglib use a Maven build
too. Why not having a tomcat Maven parent pom in svn in the path
/pom/trunk ?. This pom will contains a set of common configuration.

Thoughts ?

Thanks,
-- 
Olivier Lamy
Talend : http://talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

[1] http://jira.codehaus.org/browse/HAUS-2110

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

Re: [DISCUSS] Tomcat Maven Plugin plan

2011-08-30 Thread Henri Gomez 
> Hello,
> I have started to import sources as defined in the ip clearance. (I
> still have some java package to change : I will change to
> org.apache.tomcat.maven.plugin as a base package)
>
> My plan to improve the plugin is:
>
> * add support of tomcat7 (tru a set of new mojos with a new name :
> tomcat7:run etc... )

> * create a new mojo which will create an executable war: users will be
> able to package their war and launch it with a simple java -jar
> mywar.war (I plan to use the embeder features from tomcat7).

Nice add-ons !

> Some tasks:
>
> * Importing jira issues from codehaus (see [1] ). Let me know Mark if
> you're fine with the proposal from codehaus folks or if you need a
> real dump (btw I will create a jira @infra).
> * asking setup of repository.apache.org to be able to deploy snaphots.
> * Optional (but IMHO a nice to have): I see taglib use a Maven build
> too. Why not having a tomcat Maven parent pom in svn in the path
> /pom/trunk ?. This pom will contains a set of common configuration.
>
> Thoughts ?

It's a good idea to have such parent pom. It don't enforce anything on
the current build process but will help a bit have a desc of project
(SCM, CI, Commiters, Deps).

+1

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

Re: [VOTE] Release Apache Tomcat 7.0.21

2011-08-30 Thread Keiichi Fujino 
2011/8/30 Mark Thomas :
> The proposed Apache Tomcat 7.0.21 release is now available for voting.
>
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.21/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_21/
>
> The proposed 7.0.21 release is:
>
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 7.0.21 Alpha
> [ ] Beta   - go ahead and release as 7.0.21 Beta
> [X] Stable - go ahead and release as 7.0.21 Stable
>

Tested by my simple home-made apps.
There is not problem.


-- 
Keiichi.Fujino

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

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

2011-08-30 Thread kfujino 
Author: kfujino
Date: Tue Aug 30 09:28:23 2011
New Revision: 1163155

URL: http://svn.apache.org/viewvc?rev=1163155&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=1163155&r1=1163154&r2=1163155&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 30 09:28:23 2011
@@ -133,5 +133,5 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
   Additional patch:
   http://svn.apache.org/viewvc?rev=1162769&view=rev
-  +1: kkolinko
+  +1: kkolinko, kfujino
   -1:



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

svn commit: r1163158 - in /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org: apache/ apache/tomcat/ apache/tomcat/maven/ apache/tomcat/maven/plugin/ codehaus/mojo/tomcat/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 10:00:47 2011
New Revision: 1163158

URL: http://svn.apache.org/viewvc?rev=1163158&view=rev
Log:
change base package to org.apache.tomcat.maven.plugin

Added:
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractCatalinaMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractDeployMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractDeployWarMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractI18NMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractRunMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunWarMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractRunWarMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/AbstractWarCatalinaMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/DeployMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployOnlyMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/DeployOnlyMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/EmbeddedRegistry.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/EmbeddedRegistry.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/ExplodedMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExternalRepositoriesReloadableWebappLoader.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/ExternalRepositoriesReloadableWebappLoader.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/InplaceMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/ListMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RedeployMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/RedeployMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/mojo/tomcat/ReloadMojo.java

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java
  - copied, changed from r1163139, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/s

svn commit: r1163159 - /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 10:03:25 2011
New Revision: 1163159

URL: http://svn.apache.org/viewvc?rev=1163159&view=rev
Log:
remove not anymore package

Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/codehaus/


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

svn commit: r1163165 - in /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org: apache/ apache/tomcat/ apache/tomcat/maven/ apache/tomcat/maven/plugin/ codehaus/mojo/tomcat/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 10:38:53 2011
New Revision: 1163165

URL: http://svn.apache.org/viewvc?rev=1163165&view=rev
Log:
move resources to new package o.a.t.m.p 

Added:
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/apache/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/apache/tomcat/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/messages.properties
  - copied unchanged from r1163159, 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/codehaus/mojo/tomcat/messages.properties
Modified:

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/codehaus/mojo/tomcat/messages.properties


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

svn commit: r1163167 - /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/codehaus/

2011-08-30 Thread olamy 
Author: olamy
Date: Tue Aug 30 10:40:06 2011
New Revision: 1163167

URL: http://svn.apache.org/viewvc?rev=1163167&view=rev
Log:
remove empty directoty

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/resources/org/codehaus/


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

svn commit: r1163174 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2011-08-30 Thread markt 
Author: markt
Date: Tue Aug 30 11:24:51 2011
New Revision: 1163174

URL: http://svn.apache.org/viewvc?rev=1163174&view=rev
Log:
Apply copy/paste fix that was voted for and approved by missed in r1140903

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1163174&r1=1163173&r2=1163174&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Tue Aug 
30 11:24:51 2011
@@ -78,7 +78,7 @@ class Generator {
 private static final String VAR_ANNOTATIONPROCESSOR = 
 
System.getProperty("org.apache.jasper.compiler.Generator.VAR_ANNOTATIONPROCESSOR",
 "_jsp_annotationprocessor");
 private static final boolean POOL_TAGS_WITH_EXTENDS =
-
Boolean.getBoolean("org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY");
+
Boolean.getBoolean("org.apache.jasper.compiler.Generator.POOL_TAGS_WITH_EXTENDS");
 
 /* System property that controls if the requirement to have the object
  * used in jsp:getProperty action to be previously "introduced"

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=1163174&r1=1163173&r2=1163174&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Aug 30 11:24:51 2011
@@ -60,6 +60,14 @@
   
 
   
+  
+
+  
+51220: Correct copy/paste error in original commit for this
+issue. (markt)
+  
+
+  
 
 
   



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

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

2011-08-30 Thread markt 
Author: markt
Date: Tue Aug 30 13:27:07 2011
New Revision: 1163203

URL: http://svn.apache.org/viewvc?rev=1163203&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=1163203&r1=1163202&r2=1163203&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 30 13:27:07 2011
@@ -115,7 +115,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Update recommended version of Tomcat-Native to 1.1.22
   
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?r1=1154911&r2=1154910&pathrev=1154911
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50394
@@ -123,15 +123,15 @@ PATCHES PROPOSED TO BACKPORT:
   encountering an EOF with the HTTP APR connector.
   Native 1.1.22 is required for this fix.
   https://issues.apache.org/bugzilla/attachment.cgi?id=27438
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51736
   Make rpcTimeout configurable in BackupManager.
   http://svn.apache.org/viewvc?view=revision&revision=1162735
-  +1: kfujino, kkolinko
+  +1: kfujino, kkolinko, markt
   -1:
   Additional patch:
   http://svn.apache.org/viewvc?rev=1162769&view=rev
-  +1: kkolinko, kfujino
+  +1: kkolinko, kfujino, markt
   -1:



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

[Native:JNI] jni.Global vs jni.Lock and fatal error at childInit(..) on Linux

2011-08-30 Thread Ashwin Jayaprakash 
Hi,
I tried using the jni.Global class to do interprocess locking between 2
processes. I wasn't sure whether to use Global or the Lock class. Both seem
to have identical APIs.

It worked alright on Windows 7. The 2 communicating processes weren't even
parent-child and it still worked.

However, on Linux (Ubuntu 64bit Intel) the child process crashes at
Global.childInit(..) method. Even when the second process was started by
hand (not as a child process of the first using ProcessBuilder) it crashed.
The first few lines of the dump shown below.

The code and a related question I asked a few days ago on the same
forum: [Native:JNI]
Stability, usage and maintenance of shared memory and mutex
code

Questions:

   1. What is the difference between Global and Lock?
   2. How do you use either one of them for inter-process locking - esp. on
   Linux?


JVM dump:

---  T H R E A D  ---

Current thread (0x08492000):  JavaThread "main" [_thread_in_native, id=9706,
stack(0xb6d1,0xb6d61000)]

siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR),
si_addr=0x

Registers:
EAX=0x8ee065fc, EBX=0xb4428ff4, ECX=0x, EDX=0x
ESP=0xb6d5fedc, EBP=0xb6d5fef8, ESI=0x0855b4a8, EDI=0x08492118
EIP=0x, CR2=0x, EFLAGS=0x00010282

Top of Stack: (sp=0xb6d5fedc)
0xb6d5fedc:   b4415a76 8ee065fc 08559450 0855b4a8
0xb6d5feec:   b4415a4f 0855b4a8 08551f60 b6d5ff28
0xb6d5fefc:   b4415d90 8ee065fc 0855b4a8 08559450
0xb6d5ff0c:   08492118 b6d5ff78 b780b230 08559450
0xb6d5ff1c:   b4415d60 b6d5ff5c b45f3ff4 b6d5ff78
0xb6d5ff2c:   b45ee1fe b6d5ff5c 0855b4a8 08559450
0xb6d5ff3c:   b6d5ffc4 b6fa4b8d 08492000 084928b0
0xb6d5ff4c:   08559450 084928b4 084928b4 fffe

Instructions: (pc=0x)
0xfff0:

Stack: [0xb6d1,0xb6d61000],  sp=0xb6d5fedc,  free space=13fb6d5f860k
Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
j  org.apache.tomcat.jni.Global.childInit(Ljava/lang/String;J)J+0
j  shm.ShmReader.test()V+48
j  shm.ShmReader.main([Ljava/lang/String;)V+7
v  ~StubRoutines::call_stub


Thanks,
Ashwin.

DO NOT REPLY [Bug 51745] New: getLastModified of compilation context returns 0 on Android and it issues all time recompilation

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51745

 Bug #: 51745
   Summary: getLastModified of compilation context returns 0 on
Android and it issues all time recompilation
   Product: Tomcat 7
   Version: 7.0.20
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: metricstr...@gmail.com
Classification: Unclassified


URLConnection implementation 
org.apache.harmony.luni.internal.net.www.protocol.file.FileURLConnection
returns 0 for getLastModified and it breaks normal working of the wrapper
method in compilation context. It seems happens on Android platfrom 2.1 and can
happen for other. So I modified the method to avoid the problem like below:

try {
URL jspUrl = getResource(resource);
if (jspUrl == null) {
incrementRemoved();
return Long.valueOf(result);
}
File resFile = new File(jspUrl.getFile()); // TJWS on Android
if (resFile.exists()) {
result = resFile.lastModified();
} else {
uc = jspUrl.openConnection();
if (uc instanceof JarURLConnection) {
result = ((JarURLConnection) uc).getJarEntry().getTime();
} else {
result = uc.getLastModified();
}
}

-- 
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: r1163469 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/tipis/ webapps/docs/ webapps/docs/config/

2011-08-30 Thread kfujino 
Author: kfujino
Date: Wed Aug 31 02:00:15 2011
New Revision: 1163469

URL: http://svn.apache.org/viewvc?rev=1163469&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51736.
Make rpcTimeout configurable in BackupManager.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1163469&r1=1163468&r2=1163469&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 31 02:00:15 2011
@@ -125,13 +125,3 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/attachment.cgi?id=27438
   +1: kkolinko, markt
   -1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51736
-  Make rpcTimeout configurable in BackupManager.
-  http://svn.apache.org/viewvc?view=revision&revision=1162735
-  +1: kfujino, kkolinko, markt
-  -1:
-  Additional patch:
-  http://svn.apache.org/viewvc?rev=1162769&view=rev
-  +1: kkolinko, kfujino, markt
-  -1:

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1163469&r1=1163468&r2=1163469&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
Wed Aug 31 02:00:15 2011
@@ -65,6 +65,11 @@ public class BackupManager extends Stand
 private int mapSendOptions = 
Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK;
 
 /**
+ * Timeout for RPC messages.
+ */
+private long rpcTimeout = DEFAULT_REPL_TIMEOUT;
+
+/**
  * Constructor, just calls super()
  *
  */
@@ -197,7 +202,7 @@ public class BackupManager extends Stand
 CatalinaCluster catclust = (CatalinaCluster)cluster;
 LazyReplicatedMap map = new LazyReplicatedMap(this,
   
catclust.getChannel(),
-  DEFAULT_REPL_TIMEOUT,
+  rpcTimeout,
   getMapName(),
   getClassLoaders());
 map.setChannelSendOptions(mapSendOptions);
@@ -277,6 +282,14 @@ public class BackupManager extends Stand
 return mapSendOptions;
 }
 
+public void setRpcTimeout(long rpcTimeout) {
+this.rpcTimeout = rpcTimeout;
+}
+
+public long getRpcTimeout() {
+return rpcTimeout;
+}
+
 public String[] getInvalidatedSessions() {
 return new String[0];
 }
@@ -289,6 +302,7 @@ public class BackupManager extends Stand
 result.notifyListenersOnReplication = notifyListenersOnReplication;
 result.mapSendOptions = mapSendOptions;
 result.maxActiveSessions = maxActiveSessions;
+result.rpcTimeout = rpcTimeout;
 return result;
 }
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1163469&r1=1163468&r2=1163469&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
Wed Aug 31 02:00:15 2011
@@ -557,6 +557,10 @@ created by this Manager"
   description="mapSendOptions"
   type="int"
   writeable="false"/>
+
 http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1163469&r1=1163468&r2=1163469&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Aug 31 02:00:15 2011
@@ -306,14 +306,22 @@ public abstract class AbstractReplicated
  * @throws ChannelException
  */
 protected void broadcast(int msgtype, boolean rpc) throws ChannelException 
{
+Member[] members = channel

DO NOT REPLY [Bug 51736] Make rpcTimeout configurable in BackupManager.

2011-08-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51736

Keiichi Fujino  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Keiichi Fujino  2011-08-31 02:03:53 UTC 
---
Fixed in 6.0.x and will be in 6.0.34 onwards.

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