Re: 3.0 annotations ?

[David Blevins]

FYI, ClassFinder is just one class and you're welcome to just take a  
copy.  Struts did the same.


-David

On Aug 7, 2009, at 12:55 PM, Costin Manolache wrote:

So far ASM looks good - the size of the jar is amazing. For tomcat- 
lite I'll
probably use it instead of bcel - I'll first try directly, if I get  
confused

by the callback style I'll use xbean-finder or the tree model.

Costin

On Fri, Aug 7, 2009 at 12:49 PM, David Blevins  
wrote:


Cool.  Feel free to ping me in freenode if you want; dblevins in  
#openejb,

#geronimo and #asfinfra.

-David


On Aug 7, 2009, at 9:30 AM, Filip Hanik - Dev Lists wrote:

I'll take a look at this after I'm done with the async stuff


On 08/04/2009 03:28 PM, David Blevins wrote:



On Aug 4, 2009, at 1:22 PM, Costin Manolache wrote:

Thanks - so objectweb instead of BCEL.
I'll try it out - it's a bit different from what I had in mind,  
it looks

like xbean-finder first finds all classes and
than reads the files using the class loader ( but not  
Class.forName,

which
is good ) and keeps track of all annotations.

I was thinking of a simple File/zip based scanning, without any  
class

loader
- and just select the few
annotations we need and write a web.xml fragment as it goes,  
without

keeping
anything in memory.



I've been thinking about adding in a sort of "filter" for the  
scanning.
Something that could be supplied in the constructor.  Something  
simple

like:

 public interface Filter {
 boolean accept(String annotationName);
 }

Then you would implement that and be guaranteed to only have  
metadata for
the annotations you cared about.  In this case @Filter and  
@Servlet.   I
actually already experimented with it in a little copy of the  
ClassFinder,

would only take like 10 minutes to integrate the change in.

In terms of keeping things in memory, there really isn't that  
much in
memory, especially if you filter out the annotations you don't  
care about.
As far as needing a classloader, that is only there so we can  
return a list
of classes (or methods, or fields, etc.) when you ask for things  
that have a
specific annotation.  Someone has to load the class to get the  
annotation

data so it's just in the API for convenience.

Another thing I've been experimenting with is some additional  
byte code

reading optimizations.  Basically if you know your annotations are
class-level annotations only, you can get a boost in scan time by  
just
reading the top of the class def and skipping the rest.  The  
technique is
proven, just need to think of an elegant way to specify that is  
the behavior

you want.

I guess in 3.0 a deploy tool / phase is absolutely needed - we  
can't

have
tomcat scan all files
each time it starts up, so the user will have to do something to
re-initiate
the scanning. Like touch
web.xml, or run a re-deploy tool.

I'm curious - why objectweb and not BCEL ?



We (OpenEJB) already had a bunch of code using ASM so that's what  
I went
with -- I wrote it OpenEJB and moved it over into XBean later so  
others
could use it.  I also know a couple ASM guys and find it's good  
getting
direct tips for best performance as well as getting any features  
in we need.


-David





On Tue, Aug 4, 2009 at 12:50 PM, David Jencks 
wrote:


We use xbean-finder for this in geronimo/openejb/etc.


http://repo2.maven.org/maven2/org/apache/xbean/xbean-finder/3.5/

https://svn.apache.org/repos/asf/geronimo/xbean/trunk/xbean- 
finder


We also have a servlet 3.0 spec jar I've been trying to keep up  
to date

with the glassfish javadocs.



https://repository.apache.org/content/repositories/snapshots/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0-EA-SNAPSHOT/



https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_3.0_spec

thanks
david jencks


On Aug 4, 2009, at 11:11 AM, Costin Manolache wrote:

Hi, anyone working on the @Filter, @Servlet annotation scanner  
for



tomcat-trunk ?
If I'm understanding it correctly, tomcat will have to read  
all files

in
classes and lib and look for the
annotation - and I would guess the only reasonable option is  
looking

at
bytecode.
I checked BCEL - seems reasonably easy, but if anyone has  
different

code -
I
would rather reuse it in
tomcat-lite :-)

BTW - there is a typo in javax.servlet.ServletRegistration -  
should be

Dynamic, not Dynmaic.
I can fix it next time I get some free time...

Costin




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





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





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





--

svn re-org complete

[Mark Thomas]

The svn re-organisation is complete.

I have tested the 5.5.x build and got pretty close to the 5.5.28
release. The differences appear to be attributable to post 5.5.28 fixes
and that I am building using a different JDK version. One big difference
is that the jk and native sources or no longer included. I think this is
a good thing.

I haven't tested the jk or native builds but from past experience of
building them I think they'll be OK.

Generally, I think we'll need to be vigilant for the next releases of
each, particularly for missing LICENSE/NOTICE files.

Other points of interest:
- svn up of a sparse checkout of the Tomcat tree with all the trunks is
quicker due to the lack of externals
- as the changes to the svn web page show, the structure is a lot
simpler and needs far less explanation

This is the point where I am going to call it a night. It you notice
anything horribly broken, let me know and I'll take a look over the weekend.

Mark


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

svn commit: r802260 - /tomcat/trunk/native/

[markt]

Author: markt
Date: Fri Aug  7 22:29:43 2009
New Revision: 802260

URL: http://svn.apache.org/viewvc?rev=802260&view=rev
Log:
Remove another broken external. Not required. native sources are downloaded as 
part of the build process.

Removed:
tomcat/trunk/native/


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

svn commit: r802259 - /tomcat/tc6.0.x/trunk/native/

[markt]

Author: markt
Date: Fri Aug  7 22:28:21 2009
New Revision: 802259

URL: http://svn.apache.org/viewvc?rev=802259&view=rev
Log:
Remove the broken external. No required. native sources are downloaded as part 
of the build process.

Removed:
tomcat/tc6.0.x/trunk/native/


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

svn commit: r802256 - in /tomcat/site/trunk: docs/svn.html xdocs/svn.xml

[markt]

Author: markt
Date: Fri Aug  7 22:26:21 2009
New Revision: 802256

URL: http://svn.apache.org/viewvc?rev=802256&view=rev
Log:
Update svn docs. Singificantly simpler now the tc5.5.x modules are in one place 
rather than using externals.

Modified:
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/xdocs/svn.xml

Modified: tomcat/site/trunk/docs/svn.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=802256&r1=802255&r2=802256&view=diff
==
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Fri Aug  7 22:26:21 2009
@@ -244,68 +244,53 @@
   
   
 
-http://svn.apache.org/repos/asf/tomcat/build";>
-/build/
+http://svn.apache.org/repos/asf/tomcat/jk";>
+/jk/
 
 
-Resources used to build the distributions for Tomcat 5.x
+The native source code for the Tomcat Connectors. This includes
+mod_jk, isapi and nsapi.
   
   
 
-http://svn.apache.org/repos/asf/tomcat/container";>
-/container/
+http://svn.apache.org/repos/asf/tomcat/native";>
+/native/
 
 
-The core Tomcat code for Tomcat 5.x
+The native source code for the Tomcat Native/APR Connector.
   
   
 
-http://svn.apache.org/repos/asf/tomcat/current";>
-/current/
+http://svn.apache.org/repos/asf/tomcat/sandbox";>
+/sandbox/
 
 
-Single directory checkout for Tomcat 5.x
+An area where Tomcat committers can experiment with new ideas.
   
   
 
-http://svn.apache.org/repos/asf/tomcat/current-svn15";>
-/current-svn15
-
-
-Single directory checkout for Tomcat 5.x using svn 1.5+
-style relative links for the externals
-  
-  
-
-http://svn.apache.org/repos/asf/tomcat/connectors";>
-/connectors/
-
-
-The HTTP and AJP implementation code for Tomcat 5.x
-  
-  
-
-http://svn.apache.org/repos/asf/tomcat/jasper";>
-/jasper/
+http://svn.apache.org/repos/asf/tomcat/site";>
+/site/
 
 
-The JSP engine implmentation for Tomcat 5.x
+The Apache Tomcat website.
   
   
 
-http://svn.apache.org/repos/asf/tomcat/servletapi";>
-/servletapi/
+http://svn.apache.org/repos/asf/tomcat/tags";>
+/tags/
 
 
-The Servlet and JSP APIs for Tomcat 5.x
+Tags for the primary development branch. Mainly used for modules.
   
   
 
-http://svn.apache.org/repos/asf/tomcat/site";>
-/site/
+http://svn.apache.org/repos/asf/tomcat/tc5.5.x";>
+/tc5.5.x/
 
 
-The Apache Tomcat website
+The stable 5.5.x release branch, with separate modules but
+no use of externals.
   
   
 
@@ -314,7 +299,7 @@
 
 
 The stable 6.0.x release branch, with all modules in a single
-unified tree
+unified tree.
   
   
 
@@ -338,197 +323,6 @@
 
 
 
-
-
-
-
-
-Convenience directories
-
-
-
-
-
-
-
-
-Sources for Tomcat 6 are available from a single module.
-Tomcat 5 requires sources from multiple modules. To simplify
-checkouts of the latest sources for Tomcat 5, a Subversion feature
-called externals has been used. This groups all the modules for this major
-Tomcat version as sub-directories of a single directory and enables them to
-be checked out in a single command. The modules included for each version are
-listed in the section below.
-
-There are some caveats to remember. Since all the subdirectories are still
-really different slices from the repository, relative paths won't always work
-as expected, for example. See the
-http://svnbook.red-bean.com/en/1.1/ch07s04.html";>Externals
-Definitions section of the http://svnbook.red-bean.com/";>
-Subversion Book for details.
-
-The URLs to use to checkout each version are:
-
-  
-Apache Tomcat Version
-URL
-  
-  
-Current development
-http://svn.apache.org/repos/asf/tomcat/trunk
-  
-  
-6.0.x
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x
-  
-  
-5.5.x (pre svn 1.5)
-http://svn.apache.org/repos/asf/tomcat/current/tc5.5.x
-  
-  
-5.5.x (svn 1.5+)
-http://svn.apache.org/repos/asf/tomcat/current-svn15/tc5.5.x
-  
-
-
-Note that if you view the directory for Tomcat 5 in your browser
-it will appear to be empty due to the use of externals.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Sources by major version
-
-
-
-
-
-
-
-
-Tomcat 6.0.x is built from the following modules under
-http://svn.apache.org/repos/asf/tomcat";>
-http://svn.apache.org/repos/asf/tomcat:
-
-  
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x";>
-/tc6.0.x
-
-
-
-
-Tomcat 5.5.x is built from the following modules under
-http://svn.apache.org/repos/asf/tomcat";>
-http://svn.apache.org/repos/asf/tomcat:
-
-  
-http://svn.apache.org/repos/asf/tomcat/build/tc5.5.x";>
-/build/tc5.5.x
-
-
-  
-http://svn.apache.org/repos/asf/tomcat/container/tc5.5.x";>
-/container/tc5.5.x
-
-
-  
-http://svn.apache.org/repos/asf/tomcat/connectors/trunk";>
-/connectors/trunk
-
-
-  
-http://svn.a

svn commit: r802250 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/native/

[markt]

Author: markt
Date: Fri Aug  7 22:16:40 2009
New Revision: 802250

URL: http://svn.apache.org/viewvc?rev=802250&view=rev
Log:
Remove the external as it is breaking svn up.
Externals in tags serve no purpose as the target of the external can change.
Luckily, the tc6.0.x build does not use this external. The native source is 
downloaded by the build script.

Modified:
tomcat/tc6.0.x/tags/TOMCAT_6_0_20/native/   (props changed)

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_20/native/
('svn:externals' removed)



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

svn commit: r802245 - in /tomcat: jk/trunk/jkstatus/ tc5.5.x/trunk/connectors/jk/jkstatus/

[markt]

Author: markt
Date: Fri Aug  7 21:59:17 2009
New Revision: 802245

URL: http://svn.apache.org/viewvc?rev=802245&view=rev
Log:
Move java/native split

Added:
tomcat/tc5.5.x/trunk/connectors/jk/jkstatus/
  - copied from r802231, tomcat/jk/trunk/jkstatus/
Removed:
tomcat/jk/trunk/jkstatus/


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

svn commit: r802244 - in /tomcat: jk/trunk/conf/ tc5.5.x/trunk/connectors/jk/conf/

[markt]

Author: markt
Date: Fri Aug  7 21:58:23 2009
New Revision: 802244

URL: http://svn.apache.org/viewvc?rev=802244&view=rev
Log:
Move java/native split

Added:
tomcat/tc5.5.x/trunk/connectors/jk/conf/
  - copied from r802231, tomcat/jk/trunk/conf/
Removed:
tomcat/jk/trunk/conf/


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

svn commit: r802243 - in /tomcat: jk/trunk/test/ native/trunk/ native/trunk/examples/ native/trunk/java/ native/trunk/test/ tc5.5.x/trunk/connectors/jk/test/ tc5.5.x/trunk/connectors/jni/ tc5.5.x/trun

[markt]

Author: markt
Date: Fri Aug  7 21:56:24 2009
New Revision: 802243

URL: http://svn.apache.org/viewvc?rev=802243&view=rev
Log:
Move java/native split

Added:
tomcat/tc5.5.x/trunk/connectors/jk/test/
  - copied from r802231, tomcat/jk/trunk/test/
tomcat/tc5.5.x/trunk/connectors/jni/build.properties.default
  - copied unchanged from r802231, 
tomcat/native/trunk/build.properties.default
tomcat/tc5.5.x/trunk/connectors/jni/build.xml
  - copied unchanged from r802231, tomcat/native/trunk/build.xml
tomcat/tc5.5.x/trunk/connectors/jni/examples/
  - copied from r802231, tomcat/native/trunk/examples/
tomcat/tc5.5.x/trunk/connectors/jni/java/
  - copied from r802231, tomcat/native/trunk/java/
tomcat/tc5.5.x/trunk/connectors/jni/test/
  - copied from r802231, tomcat/native/trunk/test/
Removed:
tomcat/jk/trunk/test/
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/build.xml
tomcat/native/trunk/examples/
tomcat/native/trunk/java/
tomcat/native/trunk/test/


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

svn commit: r802242 - /tomcat/tc5.5.x/trunk/connectors/jni/

[markt]

Author: markt
Date: Fri Aug  7 21:53:10 2009
New Revision: 802242

URL: http://svn.apache.org/viewvc?rev=802242&view=rev
Log:
jni has similar issue to jk

Added:
tomcat/tc5.5.x/trunk/connectors/jni/


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

svn commit: r802240 - in /tomcat: jk/trunk/build.properties.sample jk/trunk/build.xml tc5.5.x/trunk/connectors/jk/build.xml

[markt]

Author: markt
Date: Fri Aug  7 21:51:24 2009
New Revision: 802240

URL: http://svn.apache.org/viewvc?rev=802240&view=rev
Log:
More unpicking of jk java vs native
Remove obsolete file

Added:
tomcat/tc5.5.x/trunk/connectors/jk/build.xml
  - copied unchanged from r802231, tomcat/jk/trunk/build.xml
Removed:
tomcat/jk/trunk/build.properties.sample
tomcat/jk/trunk/build.xml


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

svn commit: r802238 - in /tomcat: jk/trunk/java/ tc5.5.x/trunk/connectors/jk/java/

[markt]

Author: markt
Date: Fri Aug  7 21:49:36 2009
New Revision: 802238

URL: http://svn.apache.org/viewvc?rev=802238&view=rev
Log:
Move the java side of jk back to tc5.5.x

Added:
tomcat/tc5.5.x/trunk/connectors/jk/java/
  - copied from r802231, tomcat/jk/trunk/java/
Removed:
tomcat/jk/trunk/java/


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

svn commit: r802237 - /tomcat/tc5.5.x/trunk/connectors/jk/

[markt]

Author: markt
Date: Fri Aug  7 21:48:42 2009
New Revision: 802237

URL: http://svn.apache.org/viewvc?rev=802237&view=rev
Log:
jk is native + java - need place to move the java back to

Added:
tomcat/tc5.5.x/trunk/connectors/jk/


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

svn commit: r802231 - in /tomcat: jk/branches/jk3/ jk/trunk/ jk/trunk/jkstatus/src/share/org/apache/jk/status/ jk/trunk/support/ native/trunk/ tc5.5.x/trunk/connectors/jk/ tc5.5.x/trunk/connectors/jk3

[markt]

Author: markt
Date: Fri Aug  7 21:43:52 2009
New Revision: 802231

URL: http://svn.apache.org/viewvc?rev=802231&view=rev
Log:
Move jk and jni/native out to their new locations

Added:
tomcat/jk/branches/jk3/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/jk3/
tomcat/jk/trunk/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/jk/
tomcat/native/trunk/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/jni/
Removed:
tomcat/tc5.5.x/trunk/connectors/jk/
tomcat/tc5.5.x/trunk/connectors/jk3/
tomcat/tc5.5.x/trunk/connectors/jni/
Modified:

tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkResult.java
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkSoftware.java

tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
tomcat/jk/trunk/support/jk_exec.m4

Modified: 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java?rev=802231&r1=802218&r2=802231&view=diff
==
--- 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
 (original)
+++ 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
 Fri Aug  7 21:43:52 2009
@@ -36,7 +36,7 @@
  * Ant task that implements mod_jk 1.2.20 result message string
  * 
  * @author Peter Rossbach
- * @version $Revision:$
+ * @version $Revision$
  * @since mod_jk 1.2.20
  */
 public abstract class AbstractJkStatusTask extends AbstractCatalinaTask {

Modified: tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkResult.java
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkResult.java?rev=802231&r1=802218&r2=802231&view=diff
==
--- tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkResult.java 
(original)
+++ tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkResult.java Fri 
Aug  7 21:43:52 2009
@@ -20,7 +20,7 @@
 
 /**
  * @author Peter Rossbach
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
  * @see org.apache.jk.status.JkStatusParser
  */
 public class JkResult implements Serializable {

Modified: 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkSoftware.java
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkSoftware.java?rev=802231&r1=802218&r2=802231&view=diff
==
--- tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkSoftware.java 
(original)
+++ tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkSoftware.java Fri 
Aug  7 21:43:52 2009
@@ -20,7 +20,7 @@
 
 /**
  * @author Peter Rossbach
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
  * @see org.apache.jk.status.JkStatusParser
  */
 public class JkSoftware implements Serializable {

Modified: 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java?rev=802231&r1=802218&r2=802231&view=diff
==
--- 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
 (original)
+++ 
tomcat/jk/trunk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
 Fri Aug  7 21:43:52 2009
@@ -28,7 +28,7 @@
  * 
  * 
  * @author Peter Rossbach
- * @version $Revision:$
+ * @version $Revision$
  * @since mod_jk 1.2.20
  */
 public class JkStatusUpdateWorkerTask extends AbstractJkStatusTask {

Modified: tomcat/jk/trunk/support/jk_exec.m4
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/support/jk_exec.m4?rev=802231&r1=802218&r2=802231&view=diff
==
--- tomcat/jk/trunk/support/jk_exec.m4 (original)
+++ tomcat/jk/trunk/support/jk_exec.m4 Fri Aug  7 21:43:52 2009
@@ -19,7 +19,7 @@
 dnl
 dnl Inspired by Pier works on webapp m4 macros :)
 dnl
-dnl Version $Id:$
+dnl Version $Id$
 dnl --
 
 dnl --



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

svn commit: r802227 - in /tomcat: archive/connectors/trunk/ajp/ archive/connectors/trunk/doc/ archive/connectors/trunk/scandoc/ tc5.5.x/trunk/connectors/ajp/ tc5.5.x/trunk/connectors/doc/ tc5.5.x/trun

[markt]

Author: markt
Date: Fri Aug  7 21:41:46 2009
New Revision: 802227

URL: http://svn.apache.org/viewvc?rev=802227&view=rev
Log:
Move ajp, doc and scan doc to the archive. If any of these are required, we can 
bring them back but probably in a util directory

Added:
tomcat/archive/connectors/trunk/ajp/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/ajp/
tomcat/archive/connectors/trunk/doc/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/doc/
tomcat/archive/connectors/trunk/scandoc/
  - copied from r802218, tomcat/tc5.5.x/trunk/connectors/scandoc/
Removed:
tomcat/tc5.5.x/trunk/connectors/ajp/
tomcat/tc5.5.x/trunk/connectors/doc/
tomcat/tc5.5.x/trunk/connectors/scandoc/


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

svn commit: r802223 - /tomcat/archive/connectors/trunk/

[markt]

Author: markt
Date: Fri Aug  7 21:39:32 2009
New Revision: 802223

URL: http://svn.apache.org/viewvc?rev=802223&view=rev
Log:
need a place for stuff I am about to remove from tc5.5.x/connectors

Added:
tomcat/archive/connectors/trunk/


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

svn commit: r802221 - in /tomcat: archive/connectors/ connectors/

[markt]

Author: markt
Date: Fri Aug  7 21:38:36 2009
New Revision: 802221

URL: http://svn.apache.org/viewvc?rev=802221&view=rev
Log:
Move what's left of the connectors to the archive

Added:
tomcat/archive/connectors/
  - copied from r802219, tomcat/connectors/
Removed:
tomcat/connectors/


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

svn commit: r802219 - /tomcat/connectors/tags/jk1.2.x/

[markt]

Author: markt
Date: Fri Aug  7 21:37:34 2009
New Revision: 802219

URL: http://svn.apache.org/viewvc?rev=802219&view=rev
Log:
Delete empty dir

Removed:
tomcat/connectors/tags/jk1.2.x/


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

svn commit: r802217 - in /tomcat: connectors/branches/native/1.1.x/jni/ connectors/branches/other/JK_1_2_14/ connectors/branches/other/JK_1_2_23/ connectors/branches/other/JK_1_2_3/ connectors/branche

[markt]

Author: markt
Date: Fri Aug  7 21:35:43 2009
New Revision: 802217

URL: http://svn.apache.org/viewvc?rev=802217&view=rev
Log:
Move native and jk tags and branches
Note only the native 1.1.x branch was extracted from the rest of the connectors

Added:
tomcat/jk/branches/JK_1_2_14/
  - copied from r802202, tomcat/connectors/branches/other/JK_1_2_14/
tomcat/jk/branches/JK_1_2_23/
  - copied from r802202, tomcat/connectors/branches/other/JK_1_2_23/
tomcat/jk/branches/JK_1_2_3/
  - copied from r802202, tomcat/connectors/branches/other/JK_1_2_3/
tomcat/jk/branches/JK_1_2_4/
  - copied from r802202, tomcat/connectors/branches/other/JK_1_2_4/
tomcat/jk/branches/JK_1_2_5/
  - copied from r802202, tomcat/connectors/branches/other/JK_1_2_5/
tomcat/jk/branches/jk_isapi_plugin_chunked/
  - copied from r802202, 
tomcat/connectors/branches/other/jk_isapi_plugin_chunked/
tomcat/jk/tags/JK_1_2_0/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_0/
tomcat/jk/tags/JK_1_2_0_rel/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_0_rel/
tomcat/jk/tags/JK_1_2_1/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_1/
tomcat/jk/tags/JK_1_2_10/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_10/
tomcat/jk/tags/JK_1_2_11/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_11/
tomcat/jk/tags/JK_1_2_12/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_12/
tomcat/jk/tags/JK_1_2_13/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_13/
tomcat/jk/tags/JK_1_2_14_1/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_14_1/
tomcat/jk/tags/JK_1_2_15/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_15/
tomcat/jk/tags/JK_1_2_16/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_16/
tomcat/jk/tags/JK_1_2_17/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_17/
tomcat/jk/tags/JK_1_2_18/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_18/
tomcat/jk/tags/JK_1_2_19/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_19/
tomcat/jk/tags/JK_1_2_2/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_2/
tomcat/jk/tags/JK_1_2_20/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_20/
tomcat/jk/tags/JK_1_2_21/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_21/
tomcat/jk/tags/JK_1_2_22/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_22/
tomcat/jk/tags/JK_1_2_23/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_23/
tomcat/jk/tags/JK_1_2_24/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_24/
tomcat/jk/tags/JK_1_2_25/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_25/
tomcat/jk/tags/JK_1_2_26/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_26/
tomcat/jk/tags/JK_1_2_27/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_27/
tomcat/jk/tags/JK_1_2_28/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_28/
tomcat/jk/tags/JK_1_2_6/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_6/
tomcat/jk/tags/JK_1_2_6_rel/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_6_rel/
tomcat/jk/tags/JK_1_2_7_BETA_1/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_7_BETA_1/
tomcat/jk/tags/JK_1_2_7_BETA_2/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_7_BETA_2/
tomcat/jk/tags/JK_1_2_7_BETA_3/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_7_BETA_3/
tomcat/jk/tags/JK_1_2_8/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_8/
tomcat/jk/tags/JK_1_2_8_RC_1/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_8_RC_1/
tomcat/jk/tags/JK_1_2_9/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_9/
tomcat/jk/tags/JK_1_2_9_BETA_1/
  - copied from r802202, tomcat/connectors/tags/jk1.2.x/JK_1_2_9_BETA_1/
tomcat/native/branches/1.1.x/
  - copied from r802209, tomcat/connectors/branches/native/1.1.x/jni/
tomcat/native/tags/TOMCAT_NATIVE_1_1_0/
  - copied from r802202, tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_0/
tomcat/native/tags/TOMCAT_NATIVE_1_1_1/
  - copied from r802202, tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_1/
tomcat/native/tags/TOMCAT_NATIVE_1_1_10/
  - copied from r802202, tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_10/
tomcat/native/tags/TOMCAT_NATIVE_1_1_11/
  - copied from r802202, tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_11/
tomcat/native/tags/TOMCAT_NATIVE_1_1_12/
  - copied from r802202, tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/
tomcat/native/tags/TOMCAT_NATIVE_1_1_13/
  - copied fr

svn commit: r802204 - in /tomcat: archive/container/ archive/jasper/ archive/servletapi/ container/ jasper/ servletapi/

[markt]

Author: markt
Date: Fri Aug  7 21:26:46 2009
New Revision: 802204

URL: http://svn.apache.org/viewvc?rev=802204&view=rev
Log:
Move remaining container, jasper and servletapi elements to the archive

Added:
tomcat/archive/container/
  - copied from r802202, tomcat/container/
tomcat/archive/jasper/
  - copied from r802202, tomcat/jasper/
tomcat/archive/servletapi/
  - copied from r802202, tomcat/servletapi/
Removed:
tomcat/container/
tomcat/jasper/
tomcat/servletapi/


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

svn commit: r802199 - in /tomcat: container/tags/tc5.5.x/ jasper/tags/tc5.5.x/ servletapi/tags/servlet2.4-jsp2.0-tc5.x/

[markt]

Author: markt
Date: Fri Aug  7 21:21:17 2009
New Revision: 802199

URL: http://svn.apache.org/viewvc?rev=802199&view=rev
Log:
Remove empty dirs

Removed:
tomcat/container/tags/tc5.5.x/
tomcat/jasper/tags/tc5.5.x/
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/


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

svn commit: r802198 - in /tomcat: container/tags/tc5.5.x/TOMCAT_5_5_0/ container/tags/tc5.5.x/TOMCAT_5_5_1/ container/tags/tc5.5.x/TOMCAT_5_5_10/ container/tags/tc5.5.x/TOMCAT_5_5_11/ container/tags/t

[markt]

Author: markt
Date: Fri Aug  7 21:18:47 2009
New Revision: 802198

URL: http://svn.apache.org/viewvc?rev=802198&view=rev
Log:
Move container, jasper and servletapi tags

Added:
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/servletapi/
  - copied from r802189, 
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_2/container/
  - copied from r802189, tomcat/container/tags/tc5.5.x/TOMCAT_5_5_2/
tomcat/tc5.5.x/tags/TOMCAT_5_5_2/jasper/
  - copied from r802189, tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_2/
tomcat/tc5

svn commit: r802192 - in /tomcat: archive/build/ build/

[markt]

Author: markt
Date: Fri Aug  7 21:07:14 2009
New Revision: 802192

URL: http://svn.apache.org/viewvc?rev=802192&view=rev
Log:
Move build to the archive

Added:
tomcat/archive/build/
  - copied from r802191, tomcat/build/
Removed:
tomcat/build/


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

svn commit: r802191 - in /tomcat: build/tags/tc5.5.x/ connectors/tags/tc5.5.x/

[markt]

Author: markt
Date: Fri Aug  7 21:03:47 2009
New Revision: 802191

URL: http://svn.apache.org/viewvc?rev=802191&view=rev
Log:
Remove empty dirs

Removed:
tomcat/build/tags/tc5.5.x/
tomcat/connectors/tags/tc5.5.x/


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

svn commit: r802189 - in /tomcat: build/tags/tc5.5.x/TOMCAT_5_5_0/ build/tags/tc5.5.x/TOMCAT_5_5_1/ build/tags/tc5.5.x/TOMCAT_5_5_10/ build/tags/tc5.5.x/TOMCAT_5_5_11/ build/tags/tc5.5.x/TOMCAT_5_5_12

[markt]

Author: markt
Date: Fri Aug  7 21:01:31 2009
New Revision: 802189

URL: http://svn.apache.org/viewvc?rev=802189&view=rev
Log:
Move the build and connector tags

Added:
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_2/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_2/
tomcat/tc5.5.x/tags/TOMCAT_5_5_2/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_2/
tomcat/tc5.5.x/tags/TOMCAT_5_5_20/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_20/
tomcat/tc5.5.x/tags/TOMCAT_5_5_20/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_20/
tomcat/tc5.5.x/tags/TOMCAT_5_5_21/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_21/
tomcat/tc5.5.x/tags/TOMCAT_5_5_21/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_21/
tomcat/tc5.5.x/tags/TOMCAT_5_5_22/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_22/
tomcat/tc5.5.x/tags/TOMCAT_5_5_22/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_22/
tomcat/tc5.5.x/tags/TOMCAT_5_5_23/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_23/
tomcat/tc5.5.x/tags/TOMCAT_5_5_23/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_23/
tomcat/tc5.5.x/tags/TOMCAT_5_5_24/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_24/
tomcat/tc5.5.x/tags/TOMCAT_5_5_24/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_24/
tomcat/tc5.5.x/tags/TOMCAT_5_5_25/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_25/
tomcat/tc5.5.x/tags/TOMCAT_5_5_25/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_25/
tomcat/tc5.5.x/tags/TOMCAT_5_5_26/build/
  - copied from r802181, tomcat/build/tags/tc5.5.x/TOMCAT_5_5_26/
tomcat/tc5.5.x/tags/TOMCAT_5_5_26/connectors/
  - copied from r802158, tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_26/
tomcat/tc5.5.x/tags/TOMCAT_5_5_27/build

svn commit: r802179 - in /tomcat/tc5.5.x/tags: TOMCAT_5_5_0/ TOMCAT_5_5_1/ TOMCAT_5_5_10/ TOMCAT_5_5_11/ TOMCAT_5_5_12/ TOMCAT_5_5_13/ TOMCAT_5_5_14/ TOMCAT_5_5_15/ TOMCAT_5_5_16/ TOMCAT_5_5_17/ TOMCA

[markt]

Author: markt
Date: Fri Aug  7 20:47:43 2009
New Revision: 802179

URL: http://svn.apache.org/viewvc?rev=802179&view=rev
Log:
More structure

Added:
tomcat/tc5.5.x/tags/TOMCAT_5_5_0/
tomcat/tc5.5.x/tags/TOMCAT_5_5_1/
tomcat/tc5.5.x/tags/TOMCAT_5_5_10/
tomcat/tc5.5.x/tags/TOMCAT_5_5_11/
tomcat/tc5.5.x/tags/TOMCAT_5_5_12/
tomcat/tc5.5.x/tags/TOMCAT_5_5_13/
tomcat/tc5.5.x/tags/TOMCAT_5_5_14/
tomcat/tc5.5.x/tags/TOMCAT_5_5_15/
tomcat/tc5.5.x/tags/TOMCAT_5_5_16/
tomcat/tc5.5.x/tags/TOMCAT_5_5_17/
tomcat/tc5.5.x/tags/TOMCAT_5_5_18/
tomcat/tc5.5.x/tags/TOMCAT_5_5_19/
tomcat/tc5.5.x/tags/TOMCAT_5_5_2/
tomcat/tc5.5.x/tags/TOMCAT_5_5_20/
tomcat/tc5.5.x/tags/TOMCAT_5_5_21/
tomcat/tc5.5.x/tags/TOMCAT_5_5_22/
tomcat/tc5.5.x/tags/TOMCAT_5_5_23/
tomcat/tc5.5.x/tags/TOMCAT_5_5_24/
tomcat/tc5.5.x/tags/TOMCAT_5_5_25/
tomcat/tc5.5.x/tags/TOMCAT_5_5_26/
tomcat/tc5.5.x/tags/TOMCAT_5_5_27/
tomcat/tc5.5.x/tags/TOMCAT_5_5_28/
tomcat/tc5.5.x/tags/TOMCAT_5_5_3/
tomcat/tc5.5.x/tags/TOMCAT_5_5_4/
tomcat/tc5.5.x/tags/TOMCAT_5_5_5/
tomcat/tc5.5.x/tags/TOMCAT_5_5_6/
tomcat/tc5.5.x/tags/TOMCAT_5_5_7/
tomcat/tc5.5.x/tags/TOMCAT_5_5_8/
tomcat/tc5.5.x/tags/TOMCAT_5_5_9/


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

svn commit: r802175 - in /tomcat: jk/ jk/branches/ jk/tags/ native/ native/branches/ native/tags/

[markt]

Author: markt
Date: Fri Aug  7 20:36:45 2009
New Revision: 802175

URL: http://svn.apache.org/viewvc?rev=802175&view=rev
Log:
More structure

Added:
tomcat/jk/
tomcat/jk/branches/
tomcat/jk/tags/
tomcat/native/
tomcat/native/branches/
tomcat/native/tags/


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

svn commit: r802172 - in /tomcat/tc5.5.x/trunk: KEYS connectors/KEYS

[markt]

Author: markt
Date: Fri Aug  7 20:33:46 2009
New Revision: 802172

URL: http://svn.apache.org/viewvc?rev=802172&view=rev
Log:
Merge the keys from connectors

Removed:
tomcat/tc5.5.x/trunk/connectors/KEYS
Modified:
tomcat/tc5.5.x/trunk/KEYS

Modified: tomcat/tc5.5.x/trunk/KEYS
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/KEYS?rev=802172&r1=802171&r2=802172&view=diff
==
--- tomcat/tc5.5.x/trunk/KEYS (original)
+++ tomcat/tc5.5.x/trunk/KEYS Fri Aug  7 20:33:46 2009
@@ -181,6 +181,27 @@
 FCK1DkkAoJpMzhUJ2LrraHk7ALnqEeOlPnusAKCQ0vyLlJGktTxwzZ6yv2xwSj6O
 XQ==
 =1Jv0
+-END PGP PUBLIC KEY BLOCK
+Type bits  keyID  Date   User ID
+DSS  1024  0x7572CDEF 2001/10/12 *** DEFAULT SIGNING KEY ***
+ Remy Maucherat 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGP 6.5.1i
+
+mQGiBDvGnR4RBADPVhGl+eo6ie6UJ9E4sIW8xbBCYHQxIMwWalcLzbz2FKWl57VP
+JzoIaTZZP6op3yhRv4qRm7NGC/gpabRj/im8vK7eKgoh2VVKhqVdIjWbQW+u9pEb
+pXlp1AAFUbP4kqSIggV54s4lRulE6Uq0eDy6sXK8mBFLGRggwEFvLTHPYQCg/2qx
+u1/hBovB0I8+XJoSzconttMEAJVYrxD2W9FhnVCn3ffHhkjQBxUeXr8bQIRwid6R
+ukAqlcVkGohOngdJ94O7KL40mm2A0t9APFVC0tgEk0M7piB5cE1zAZjoLTrlvWrC
+0tH0LzEyaUgvHdG1fVeHtgwsiGW/raWDzCfiIvLCx80yiaMw2TtYXLmhjy+1qWv3
+v78JA/4idwIP7zEF8O6hSEcn5RopddUte5Ne+Ya+fsuSmKDCqPNnIkVvHYarFbkY
+QPDEiUA2fS9j1ShDz3t0Adt1TRbN2VbENH6rYbx9gwiQGu41jjRVit2Z9JM5YDyq
+VDyYH5PpyKOJkKPzuIFzq6Wn6dh/wczhDNn7YHXH49ES2nO+/LQgUmVteSBNYXVj
+aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6JAE4EEBECAA4FAjvGnR4ECwMBAgIZAQAK
+CRBuHJULdXLN72cHAKCbdPNI0ep6mGivq/xXoeQOPbBEBwCgpBbCFwc4Q6W+Y+VT
+KQh+f5jVojw=
+=1iBa
 -END PGP PUBLIC KEY BLOCK-
 
 Type Bits/KeyID Date   User ID
@@ -256,6 +277,217 @@
 =O17Z
 -END PGP PUBLIC KEY BLOCK-
 
+Type bits  keyID  Date   User ID
+DSS  3072/1024 0xA01422B5 2001/10/09 *** DEFAULT SIGNING KEY ***
+ Remy Maucherat 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGP 6.5.8
+
+mQGiBDvDY+ERBADJ+GZ2SSlHMb0wRjfsHdJbb4zrRfHn4McEkYGUXyLtZJquAj3V
+8/JxrL3+wiBuXFQitf5qYXLDlRH+F1iFT17kqalFTvxZMA3Hg2kLB6ZUvIP8sTrD
+b8WJU18Lu2GwPMEUT1ito2eG3PDzgIVRwA0c5btLOhkwoRT+5bEl4ad8KwCg/0XV
+CEchMuZtOdJi6WOf8hfwF+cD/iTdfkuxGZEn6fK9erJb5GCr1v/0l83qKU36r8DX
+3kGpR6yac/2xv7+NEaKS1t9k/0seRsFQ/gWZA192HpsRhhe4C2lWmTh+YI7jS7mB
+Bw8dY304yhwPZuUYw86cLMpG5PXz9519kkDFGHlLG6MaxHnhfe0dXWzs/yv4uSsm
+35QfBACUx677GL4pEFJq2pP30aWhxc1but0ncLh5WDCael7wVuTGVSk8TorWoteM
+GcQkmDLo+my7xettXUTssijSn+NVRsFjcgMEpAWeJTBtfDRCyf312ECx7BM5G9oh
+HxtzMW4ZJYY4M1+3qklgpZaEYx1J8g8bIBv661vunbbcj1/OrLQgUmVteSBNYXVj
+aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6JAE4EEBECAA4FAjvDY+EECwMBAgIZAQAK
+CRB7QXnboBQitdfbAKD8zt0jeFHIlX6awuu9atxWyWaB3ACfb08JdEElpF7cTZhx
+yRpnKZDUvpa5Aw0EO8Nj5RAMAMwdd1ckOErixPDojhNnl06SE2H22+slDhf99pj3
+yHx5sHIdOHX79sFzxIMRJitDYMPj6NYK/aEoJguuqa6zZQ+iAFMBoHzWq6MSHvoP
+Ks4fdIRPyvMX86RA6dfSd7ZCLQI2wSbLaF6dfJgJCo1+Le3kXXn11JJPmxiO/Cqn
+S3wy9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstD
+qZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryD
+xUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSR
+BzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGze
+MyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1B
+n5x8vYlLIhkmuquiXsNV6UwybwACAgwAkwuQXCs1OPX398vydLxtt6AX9KreX4wm
+ykMG+hjgNUsUhYbi03fInYtqTd0TS9qtvSyFUP1aahoY7xKDECI8fyN20Xphb2ih
+fgipT6lBFH1tYX4cS1NHcQEdPU3b96Uat6cy7bma0/kUr3EZuxQlc6UVvsxD+lsT
+HsSqymY3om8Jx2yaDB58yK/VRUMs7/GPaqe/jQiHxbwyS7sWqhew7uNp+wJL5lEx
+x5PkbKj/eA2pKUpMrPKVJfK3E4nq5Q9feBgukhMCADxon2KYa4z4orU3EkM7I3sn
+wujj9dnCkoK2+P6/WvhNhR6q9fbdTHQqtDi4zSwip90m4CPWX/26RrEw2Lax1vC9
+LNJu5olQORxWvaDEoPFkU23kohGe9Qtxozqjn2Sya8VQoq1X5IMrQoCrf3MUWGrJ
++UzABENqSj4mM5XSGazkzTsx59hQMLEz/zKsFlQqTSaZ88VXNoRjj3Hm7b8KQeDE
+nTVtyjsrfoYjqPLSdhypI6HyNbUZ4mDJiQBGBBgRAgAGBQI7w2PlAAoJEHtBedug
+FCK1DkkAoJpMzhUJ2LrraHk7ALnqEeOlPnusAKCQ0vyLlJGktTxwzZ6yv2xwSj6O
+XQ==
+=1Jv0
+-END PGP PUBLIC KEY BLOCK
+
+Type bits  keyID  Date   User ID
+DSS  1024  0xFEA4C043 2001-06-24 Ignacio J. Ortega 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDs1PSgRBAD8g1RLIdDEk1+XW0DeaOrtzDPRUblHwty9S7a2UfiOEJA8GMZv
+GAT7HcEynxt6P4a58k3DceWvRw4kcu5PRF++qufzroWkSHK3V/gaDxva9XavfbS0
+vgQC5In4ZG+iKw1CbGeXzMnA28YIVbQztpKWFhyrD5q86DjrcBTefM2e0wCg/+iA
+J0DSHbKfiu9mqe8HzVcuXlsEALSSTdUJPRa80bmr6prsuc2heJLa22ddGHkJ5OXD
+pvY9mmY+fDe9wL5bnsbnDvmhwoDAsog/+jjWjJhleF+TR+wzEkmO5fYLv8qZPXet
+r6loSaY84XwrcN1ZMvGKfhfZMeAGg/McUeivT2q+3NH2dD5IK5tM960lPvq2kk6f
+41miA/4kxh/en3CG/qyfb0E33L6XY5xY+IMTnGX7tKFZuGcXtni04mqnmJAdGcoM
+Y8IwLQ1jyy3rJnXYKcJ59ZaIiku5fsOYOMu2MKRr7H6sBhC9wbmk1XfAHNJAaWTK
+GItHjCIIjneFZwZttC44PRspMI5bzb2sskSlH1gO7bt7nbDKMLQkSWduYWNpbyBK
+LiBPcnRlZ2EgPG5hY2hvQGFwYWNoZS5vcmc+iQBYBBARAgAYBQI7NT0oCAsDCQgH
+AgEKAhkBBRsDAAoJEAO7fiv+pMBDCqQAn08IyL3DNeIF6mo4DlE4BVk7rEN4
+AJ43Di7ytG4nj9y5qioBRhfBjkMZRIkARQQQEQIABgUCO

svn commit: r802171 - /tomcat/tc5.5.x/trunk/build/build.xml

[markt]

Author: markt
Date: Fri Aug  7 20:33:26 2009
New Revision: 802171

URL: http://svn.apache.org/viewvc?rev=802171&view=rev
Log:
Fix the build script.

Modified:
tomcat/tc5.5.x/trunk/build/build.xml

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=802171&r1=802170&r2=802171&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Fri Aug  7 20:33:26 2009
@@ -30,7 +30,7 @@
 
   
   
-  
+  
   
   
   
@@ -1303,12 +1303,14 @@
 
   
 
-
-
 
 
 
   
+  
+
+
+  
 
 
 
@@ -1428,6 +1430,11 @@
   
 
   
+  
+
+
+
+  
 
 
 
@@ -1554,7 +1561,7 @@
description="Create a Tomcat 5 packaged distribution">
 
 
-
 

svn commit: r802164 - in /tomcat/tc5.5.x/trunk: ./ build/ connectors/ container/ jasper/ servletapi/

[markt]

Author: markt
Date: Fri Aug  7 20:00:09 2009
New Revision: 802164

URL: http://svn.apache.org/viewvc?rev=802164&view=rev
Log:
First pass at cleaning up obsolete files. Haven't tried building yet. That 
comes next. Also need to merge KEYS files.

Added:
tomcat/tc5.5.x/trunk/KEYS
  - copied unchanged from r802162, tomcat/tc5.5.x/trunk/build/KEYS
tomcat/tc5.5.x/trunk/LICENSE
  - copied unchanged from r802162, tomcat/tc5.5.x/trunk/build/LICENSE
tomcat/tc5.5.x/trunk/NOTICE
  - copied unchanged from r802162, tomcat/tc5.5.x/trunk/build/NOTICE
Removed:
tomcat/tc5.5.x/trunk/build/KEYS
tomcat/tc5.5.x/trunk/build/LICENSE
tomcat/tc5.5.x/trunk/build/NOTICE
tomcat/tc5.5.x/trunk/connectors/.classpath
tomcat/tc5.5.x/trunk/connectors/.project
tomcat/tc5.5.x/trunk/connectors/LICENSE
tomcat/tc5.5.x/trunk/connectors/NOTICE
tomcat/tc5.5.x/trunk/connectors/README.txt
tomcat/tc5.5.x/trunk/connectors/RELEASE-NOTES.txt
tomcat/tc5.5.x/trunk/container/.classpath
tomcat/tc5.5.x/trunk/container/.project
tomcat/tc5.5.x/trunk/container/LICENSE
tomcat/tc5.5.x/trunk/container/NOTICE
tomcat/tc5.5.x/trunk/container/Tomcat5.5.launch
tomcat/tc5.5.x/trunk/jasper/.classpath
tomcat/tc5.5.x/trunk/jasper/.project
tomcat/tc5.5.x/trunk/jasper/BUILDING.txt
tomcat/tc5.5.x/trunk/jasper/LICENSE
tomcat/tc5.5.x/trunk/jasper/build.properties.sample
tomcat/tc5.5.x/trunk/servletapi/.classpath
tomcat/tc5.5.x/trunk/servletapi/.project
Modified:
tomcat/tc5.5.x/trunk/   (props changed)

Propchange: tomcat/tc5.5.x/trunk/
--
--- svn:ignore (added)
+++ svn:ignore Fri Aug  7 20:00:09 2009
@@ -0,0 +1,2 @@
+.classpath
+.project



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

Re: 3.0 annotations ?

[Costin Manolache]

So far ASM looks good - the size of the jar is amazing. For tomcat-lite I'll
probably use it instead of bcel - I'll first try directly, if I get confused
by the callback style I'll use xbean-finder or the tree model.

Costin

On Fri, Aug 7, 2009 at 12:49 PM, David Blevins wrote:

> Cool.  Feel free to ping me in freenode if you want; dblevins in #openejb,
> #geronimo and #asfinfra.
>
> -David
>
>
> On Aug 7, 2009, at 9:30 AM, Filip Hanik - Dev Lists wrote:
>
>  I'll take a look at this after I'm done with the async stuff
>>
>> On 08/04/2009 03:28 PM, David Blevins wrote:
>>
>>>
>>> On Aug 4, 2009, at 1:22 PM, Costin Manolache wrote:
>>>
>>>  Thanks - so objectweb instead of BCEL.
 I'll try it out - it's a bit different from what I had in mind, it looks
 like xbean-finder first finds all classes and
 than reads the files using the class loader ( but not Class.forName,
 which
 is good ) and keeps track of all annotations.

 I was thinking of a simple File/zip based scanning, without any class
 loader
 - and just select the few
 annotations we need and write a web.xml fragment as it goes, without
 keeping
 anything in memory.

>>>
>>> I've been thinking about adding in a sort of "filter" for the scanning.
>>>  Something that could be supplied in the constructor.  Something simple
>>> like:
>>>
>>>   public interface Filter {
>>>   boolean accept(String annotationName);
>>>   }
>>>
>>> Then you would implement that and be guaranteed to only have metadata for
>>> the annotations you cared about.  In this case @Filter and @Servlet.   I
>>> actually already experimented with it in a little copy of the ClassFinder,
>>> would only take like 10 minutes to integrate the change in.
>>>
>>> In terms of keeping things in memory, there really isn't that much in
>>> memory, especially if you filter out the annotations you don't care about.
>>>  As far as needing a classloader, that is only there so we can return a list
>>> of classes (or methods, or fields, etc.) when you ask for things that have a
>>> specific annotation.  Someone has to load the class to get the annotation
>>> data so it's just in the API for convenience.
>>>
>>> Another thing I've been experimenting with is some additional byte code
>>> reading optimizations.  Basically if you know your annotations are
>>> class-level annotations only, you can get a boost in scan time by just
>>> reading the top of the class def and skipping the rest.  The technique is
>>> proven, just need to think of an elegant way to specify that is the behavior
>>> you want.
>>>
>>>  I guess in 3.0 a deploy tool / phase is absolutely needed - we can't
 have
 tomcat scan all files
 each time it starts up, so the user will have to do something to
 re-initiate
 the scanning. Like touch
 web.xml, or run a re-deploy tool.

 I'm curious - why objectweb and not BCEL ?

>>>
>>> We (OpenEJB) already had a bunch of code using ASM so that's what I went
>>> with -- I wrote it OpenEJB and moved it over into XBean later so others
>>> could use it.  I also know a couple ASM guys and find it's good getting
>>> direct tips for best performance as well as getting any features in we need.
>>>
>>> -David
>>>
>>>
>>>

 On Tue, Aug 4, 2009 at 12:50 PM, David Jencks >>> >wrote:

  We use xbean-finder for this in geronimo/openejb/etc.
>
> http://repo2.maven.org/maven2/org/apache/xbean/xbean-finder/3.5/
>
> https://svn.apache.org/repos/asf/geronimo/xbean/trunk/xbean-finder
>
> We also have a servlet 3.0 spec jar I've been trying to keep up to date
> with the glassfish javadocs.
>
>
>
> https://repository.apache.org/content/repositories/snapshots/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0-EA-SNAPSHOT/
>
>
>
> https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_3.0_spec
>
> thanks
> david jencks
>
>
> On Aug 4, 2009, at 11:11 AM, Costin Manolache wrote:
>
> Hi, anyone working on the @Filter, @Servlet annotation scanner for
>
>> tomcat-trunk ?
>> If I'm understanding it correctly, tomcat will have to read all files
>> in
>> classes and lib and look for the
>> annotation - and I would guess the only reasonable option is looking
>> at
>> bytecode.
>> I checked BCEL - seems reasonably easy, but if anyone has different
>> code -
>> I
>> would rather reuse it in
>> tomcat-lite :-)
>>
>> BTW - there is a typo in javax.servlet.ServletRegistration - should be
>> Dynamic, not Dynmaic.
>> I can fix it next time I get some free time...
>>
>> Costin
>>
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
>
>>>
>>> --

svn commit: r802163 - in /tomcat: current-svn15/ current/

[markt]

Author: markt
Date: Fri Aug  7 19:53:56 2009
New Revision: 802163

URL: http://svn.apache.org/viewvc?rev=802163&view=rev
Log:
Remove the current dirs. The previous commit broke them.

Removed:
tomcat/current/
tomcat/current-svn15/


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

svn commit: r802162 - in /tomcat: build/tc5.5.x/ connectors/trunk/ container/tc5.5.x/ current/tc5.5.x/ jasper/tc5.5.x/ servletapi/servlet2.4-jsp2.0-tc5.x/ tc5.5.x/trunk/ tc5.5.x/trunk/build/ tc5.5.x/t

[markt]

Author: markt
Date: Fri Aug  7 19:49:24 2009
New Revision: 802162

URL: http://svn.apache.org/viewvc?rev=802162&view=rev
Log:
Stage 1 of 5.5.x move - move trunk

Added:
tomcat/tc5.5.x/trunk/STATUS.txt
  - copied unchanged from r801166, tomcat/current/tc5.5.x/STATUS.txt
tomcat/tc5.5.x/trunk/build/
  - copied from r802155, tomcat/build/tc5.5.x/
tomcat/tc5.5.x/trunk/connectors/
  - copied from r801166, tomcat/connectors/trunk/
tomcat/tc5.5.x/trunk/container/
  - copied from r801166, tomcat/container/tc5.5.x/
tomcat/tc5.5.x/trunk/jasper/
  - copied from r801166, tomcat/jasper/tc5.5.x/
tomcat/tc5.5.x/trunk/servletapi/
  - copied from r801166, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/
Removed:
tomcat/build/tc5.5.x/
tomcat/connectors/trunk/
tomcat/container/tc5.5.x/
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/


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

Re: 3.0 annotations ?

[David Blevins]

Cool.  Feel free to ping me in freenode if you want; dblevins in  
#openejb, #geronimo and #asfinfra.


-David

On Aug 7, 2009, at 9:30 AM, Filip Hanik - Dev Lists wrote:


I'll take a look at this after I'm done with the async stuff

On 08/04/2009 03:28 PM, David Blevins wrote:


On Aug 4, 2009, at 1:22 PM, Costin Manolache wrote:


Thanks - so objectweb instead of BCEL.
I'll try it out - it's a bit different from what I had in mind, it  
looks

like xbean-finder first finds all classes and
than reads the files using the class loader ( but not  
Class.forName, which

is good ) and keeps track of all annotations.

I was thinking of a simple File/zip based scanning, without any  
class loader

- and just select the few
annotations we need and write a web.xml fragment as it goes,  
without keeping

anything in memory.


I've been thinking about adding in a sort of "filter" for the  
scanning.  Something that could be supplied in the constructor.   
Something simple like:


   public interface Filter {
   boolean accept(String annotationName);
   }

Then you would implement that and be guaranteed to only have  
metadata for the annotations you cared about.  In this case @Filter  
and @Servlet.   I actually already experimented with it in a little  
copy of the ClassFinder, would only take like 10 minutes to  
integrate the change in.


In terms of keeping things in memory, there really isn't that much  
in memory, especially if you filter out the annotations you don't  
care about.  As far as needing a classloader, that is only there so  
we can return a list of classes (or methods, or fields, etc.) when  
you ask for things that have a specific annotation.  Someone has to  
load the class to get the annotation data so it's just in the API  
for convenience.


Another thing I've been experimenting with is some additional byte  
code reading optimizations.  Basically if you know your annotations  
are class-level annotations only, you can get a boost in scan time  
by just reading the top of the class def and skipping the rest.   
The technique is proven, just need to think of an elegant way to  
specify that is the behavior you want.


I guess in 3.0 a deploy tool / phase is absolutely needed - we  
can't have

tomcat scan all files
each time it starts up, so the user will have to do something to  
re-initiate

the scanning. Like touch
web.xml, or run a re-deploy tool.

I'm curious - why objectweb and not BCEL ?


We (OpenEJB) already had a bunch of code using ASM so that's what I  
went with -- I wrote it OpenEJB and moved it over into XBean later  
so others could use it.  I also know a couple ASM guys and find  
it's good getting direct tips for best performance as well as  
getting any features in we need.


-David





On Tue, Aug 4, 2009 at 12:50 PM, David Jencks >wrote:



We use xbean-finder for this in geronimo/openejb/etc.

http://repo2.maven.org/maven2/org/apache/xbean/xbean-finder/3.5/

https://svn.apache.org/repos/asf/geronimo/xbean/trunk/xbean-finder

We also have a servlet 3.0 spec jar I've been trying to keep up  
to date

with the glassfish javadocs.


https://repository.apache.org/content/repositories/snapshots/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0-EA-SNAPSHOT/


https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_3.0_spec

thanks
david jencks


On Aug 4, 2009, at 11:11 AM, Costin Manolache wrote:

Hi, anyone working on the @Filter, @Servlet annotation scanner for

tomcat-trunk ?
If I'm understanding it correctly, tomcat will have to read all  
files in

classes and lib and look for the
annotation - and I would guess the only reasonable option is  
looking at

bytecode.
I checked BCEL - seems reasonably easy, but if anyone has  
different code -

I
would rather reuse it in
tomcat-lite :-)

BTW - there is a typo in javax.servlet.ServletRegistration -  
should be

Dynamic, not Dynmaic.
I can fix it next time I get some free time...

Costin




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





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





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





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

svn commit: r802157 - /tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

[markt]

Author: markt
Date: Fri Aug  7 19:35:32 2009
New Revision: 802157

URL: http://svn.apache.org/viewvc?rev=802157&view=rev
Log:
keep track of which bits of the spec have been checked

Modified:
tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt?rev=802157&r1=802156&r2=802157&view=diff
==
--- tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (original)
+++ tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Fri Aug  7 19:35:32 2009
@@ -28,8 +28,15 @@
- Done
 
 3. Implement all the new Servlet 3 features
+   - Sections 1 to 6- not checked
+   - Section 7 - in progress
+ 7.1, 7.2, 7.3, 7.4, 7.5, 7.6 - Compliant
+ 7.7.1 - Compliant
+ 7.7.2 - When is IAE thrown?
+ 7.7.3 - Compliant
+   - Sections 8 onwards - not checked
 
-4. Do an alpha realease (from trunk)
+4. Do an alpha release (from trunk)
- Create tc7.0.x\tags to hold release tags
- Create Bugzilla project
- Add to web site



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

svn commit: r802155 - in /tomcat/tc5.5.x: ./ branches/ tags/ trunk/

[markt]

Author: markt
Date: Fri Aug  7 19:24:38 2009
New Revision: 802155

URL: http://svn.apache.org/viewvc?rev=802155&view=rev
Log:
Add structure ready for 5.5.x move

Added:
tomcat/tc5.5.x/
tomcat/tc5.5.x/branches/
tomcat/tc5.5.x/tags/
tomcat/tc5.5.x/trunk/


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

svn commit: r802151 - /tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java

[markt]

Author: markt
Date: Fri Aug  7 19:19:46 2009
New Revision: 802151

URL: http://svn.apache.org/viewvc?rev=802151&view=rev
Log:
Couple more unused imports

Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java?rev=802151&r1=802150&r2=802151&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java Fri 
Aug  7 19:19:46 2009
@@ -20,8 +20,7 @@
 
 import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+
 /**
  * TODO SERVLET 3 - async 
  * @author fhanik



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

svn commit: r802150 - /tomcat/trunk/java/javax/servlet/AsyncContext.java

[markt]

Author: markt
Date: Fri Aug  7 19:18:21 2009
New Revision: 802150

URL: http://svn.apache.org/viewvc?rev=802150&view=rev
Log:
Remove catalina import from spec classes

Modified:
tomcat/trunk/java/javax/servlet/AsyncContext.java

Modified: tomcat/trunk/java/javax/servlet/AsyncContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncContext.java?rev=802150&r1=802149&r2=802150&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncContext.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncContext.java Fri Aug  7 19:18:21 2009
@@ -16,8 +16,6 @@
 */
 package javax.servlet;
 
-import org.apache.catalina.core.AsyncContextImpl.AsyncState;
-
 /**
  * @since Servlet 3.0
  * $Id$



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

svn commit: r802147 - in /tomcat/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java Request.java

[markt]

Author: markt
Date: Fri Aug  7 19:17:36 2009
New Revision: 802147

URL: http://svn.apache.org/viewvc?rev=802147&view=rev
Log:
Fix some Eclipse warnings

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=802147&r1=802146&r2=802147&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Aug  
7 19:17:36 2009
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.util.EnumSet;
 
-import javax.servlet.DispatcherType;
 import javax.servlet.SessionTrackingMode;
 
 import org.apache.catalina.CometEvent;

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=802147&r1=802146&r2=802147&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Aug  7 
19:17:36 2009
@@ -36,7 +36,6 @@
 
 import javax.security.auth.Subject;
 import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterChain;
@@ -406,7 +405,7 @@
 
 
 public void setAsyncSupported(boolean asyncSupported) {
-asyncSupported = asyncSupported?Boolean.TRUE:Boolean.FALSE;
+asyncSupported = asyncSupported ? true : false;
 }
 
 /**



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

svn commit: r802146 - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ ha/session/

[markt]

Author: markt
Date: Fri Aug  7 19:15:54 2009
New Revision: 802146

URL: http://svn.apache.org/viewvc?rev=802146&view=rev
Log:
Complete implementation of SessionCookieConfig

Added:

tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java  
 (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=802146&r1=802145&r2=802146&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Aug  7 
19:15:54 2009
@@ -48,7 +48,6 @@
 import javax.servlet.ServletRequestAttributeEvent;
 import javax.servlet.ServletRequestAttributeListener;
 import javax.servlet.ServletResponse;
-import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -63,6 +62,7 @@
 import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.ApplicationSessionCookieConfig;
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.util.Enumerator;
@@ -2384,9 +2384,15 @@
&& getContext().getServletContext().
getEffectiveSessionTrackingModes().contains(
SessionTrackingMode.COOKIE)) {
-Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
-   session.getIdInternal());
-configureSessionCookie(cookie);
+Cookie cookie =
+ApplicationSessionCookieConfig.createSessionCookie(
+context.getServletContext().getSessionCookieConfig(),
+session.getIdInternal(),
+isSecure(),
+context.getUseHttpOnly(),
+connector.getEmptySessionPath(),
+context.getEncodedPath());
+
 response.addCookieInternal(cookie);
 }
 
@@ -2399,50 +2405,6 @@
 
 }
 
-/**
- * Configures the given JSESSIONID cookie.
- *
- * @param cookie The JSESSIONID cookie to be configured
- */
-protected void configureSessionCookie(Cookie cookie) {
-SessionCookieConfig scc =
-context.getServletContext().getSessionCookieConfig();
-
-cookie.setMaxAge(-1);
-
-if (scc != null) {
-cookie.setComment(scc.getComment());
-}
-
-if (scc != null) {
-cookie.setDomain(scc.getDomain());
-}
-
-if ((scc != null && scc.isSecure()) || isSecure()) {
-cookie.setSecure(true);
-}
-
-if ((scc != null && scc.isHttpOnly()) ||
-context.getUseHttpOnly()) {
-cookie.setHttpOnly(true);
-}
-
-if (!connector.getEmptySessionPath() &&
-scc != null && scc.getPath() != null) {
-cookie.setPath(scc.getPath());
-} else {
-String contextPath = null;
-if (!connector.getEmptySessionPath() && (getContext() != null)) {
-contextPath = getContext().getEncodedPath();
-}
-if ((contextPath != null) && (contextPath.length() > 0)) {
-cookie.setPath(contextPath);
-} else {
-cookie.setPath("/");
-}
-}
-}
-
 protected String unescape(String s) {
 if (s==null) return null;
 if (s.indexOf('\\') == -1) return s;

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=802146&r1=802145&r2=802146&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Aug  
7 19:15:54 2009
@@ -171,7 +171,8 @@
 /**
  * Session Cookie config
  */
-private SessionCookieConfig sessionCookieConfig;
+private SessionCookieConfig sessionCookieConfig =
+new ApplicationSessionCookieConfig();
 
 /**
  * Session tracking modes

Added: 
tomcat/trunk/java/org/apache/catalina/core/A

svn commit: r802143 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java

[markt]

Author: markt
Date: Fri Aug  7 18:54:18 2009
New Revision: 802143

URL: http://svn.apache.org/viewvc?rev=802143&view=rev
Log:
Minor code clean-up

Modified:

tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=802143&r1=802142&r2=802143&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
 Fri Aug  7 18:54:18 2009
@@ -109,7 +109,7 @@
  *ClusterMessage - the message received from the cluster
  */
 public void messageReceived(ClusterMessage msg) {
-if (msg instanceof SessionIDMessage && msg != null) {
+if (msg instanceof SessionIDMessage) {
 SessionIDMessage sessionmsg = (SessionIDMessage) msg;
 if (log.isDebugEnabled())
 log.debug(sm.getString(



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

Re: 3.0 annotations ?

[Filip Hanik - Dev Lists]

I'll take a look at this after I'm done with the async stuff

On 08/04/2009 03:28 PM, David Blevins wrote:


On Aug 4, 2009, at 1:22 PM, Costin Manolache wrote:


Thanks - so objectweb instead of BCEL.
I'll try it out - it's a bit different from what I had in mind, it looks
like xbean-finder first finds all classes and
than reads the files using the class loader ( but not Class.forName, 
which

is good ) and keeps track of all annotations.

I was thinking of a simple File/zip based scanning, without any class 
loader

- and just select the few
annotations we need and write a web.xml fragment as it goes, without 
keeping

anything in memory.


I've been thinking about adding in a sort of "filter" for the 
scanning.  Something that could be supplied in the constructor.  
Something simple like:


public interface Filter {
boolean accept(String annotationName);
}

Then you would implement that and be guaranteed to only have metadata 
for the annotations you cared about.  In this case @Filter and 
@Servlet.   I actually already experimented with it in a little copy 
of the ClassFinder, would only take like 10 minutes to integrate the 
change in.


In terms of keeping things in memory, there really isn't that much in 
memory, especially if you filter out the annotations you don't care 
about.  As far as needing a classloader, that is only there so we can 
return a list of classes (or methods, or fields, etc.) when you ask 
for things that have a specific annotation.  Someone has to load the 
class to get the annotation data so it's just in the API for convenience.


Another thing I've been experimenting with is some additional byte 
code reading optimizations.  Basically if you know your annotations 
are class-level annotations only, you can get a boost in scan time by 
just reading the top of the class def and skipping the rest.  The 
technique is proven, just need to think of an elegant way to specify 
that is the behavior you want.


I guess in 3.0 a deploy tool / phase is absolutely needed - we can't 
have

tomcat scan all files
each time it starts up, so the user will have to do something to 
re-initiate

the scanning. Like touch
web.xml, or run a re-deploy tool.

I'm curious - why objectweb and not BCEL ?


We (OpenEJB) already had a bunch of code using ASM so that's what I 
went with -- I wrote it OpenEJB and moved it over into XBean later so 
others could use it.  I also know a couple ASM guys and find it's good 
getting direct tips for best performance as well as getting any 
features in we need.


-David





On Tue, Aug 4, 2009 at 12:50 PM, David Jencks 
wrote:



We use xbean-finder for this in geronimo/openejb/etc.

http://repo2.maven.org/maven2/org/apache/xbean/xbean-finder/3.5/

https://svn.apache.org/repos/asf/geronimo/xbean/trunk/xbean-finder

We also have a servlet 3.0 spec jar I've been trying to keep up to date
with the glassfish javadocs.


https://repository.apache.org/content/repositories/snapshots/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0-EA-SNAPSHOT/ 




https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_3.0_spec 



thanks
david jencks


On Aug 4, 2009, at 11:11 AM, Costin Manolache wrote:

Hi, anyone working on the @Filter, @Servlet annotation scanner for

tomcat-trunk ?
If I'm understanding it correctly, tomcat will have to read all 
files in

classes and lib and look for the
annotation - and I would guess the only reasonable option is 
looking at

bytecode.
I checked BCEL - seems reasonably easy, but if anyone has different 
code -

I
would rather reuse it in
tomcat-lite :-)

BTW - there is a typo in javax.servlet.ServletRegistration - should be
Dynamic, not Dynmaic.
I can fix it next time I get some free time...

Costin




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





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





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

svn commit: r802064 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Aug  7 16:10:27 2009
New Revision: 802064

URL: http://svn.apache.org/viewvc?rev=802064&view=rev
Log:
Get SSL session tracking working again.
If you use http you'll get new session ID on every request
If you use https you get the SSL session ID

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=802064&r1=802063&r2=802064&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Aug  
7 16:10:27 2009
@@ -47,8 +47,11 @@
 import javax.servlet.SessionTrackingMode;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
+import org.apache.catalina.Service;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.deploy.ApplicationParameter;
 import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.RequestUtil;
@@ -90,8 +93,8 @@
 this.context = context;
 this.basePath = basePath;
 
-// Populate default session tracking modes
-populateDefaultSessionTrackingModes();
+// Populate session tracking modes
+populateSessionTrackingModes();
 }
 
 
@@ -175,6 +178,7 @@
  */
 private EnumSet sessionTrackingModes = null;
 private EnumSet defaultSessionTrackingModes = null;
+private EnumSet supportedSessionTrackingModes = null;
 
 // - Public Methods
 
@@ -980,15 +984,27 @@
 return defaultSessionTrackingModes;
 }
 
-private void populateDefaultSessionTrackingModes() {
+private void populateSessionTrackingModes() {
 // URL re-writing is always enabled by default
 defaultSessionTrackingModes = EnumSet.of(SessionTrackingMode.URL); 
+supportedSessionTrackingModes = EnumSet.of(SessionTrackingMode.URL);
 
 if (context.getCookies()) {
 defaultSessionTrackingModes.add(SessionTrackingMode.COOKIE);
+supportedSessionTrackingModes.add(SessionTrackingMode.COOKIE);
 }
 
 // SSL not enabled by default as it can only used on its own 
+// Context > Host > Engine > Service
+Service s = ((Engine) context.getParent().getParent()).getService();
+Connector[] connectors = s.findConnectors();
+// Need at least one SSL enabled connector to use the SSL session ID.
+for (Connector connector : connectors) {
+if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
+supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
+break;
+}
+} 
 }
 
 /**
@@ -1025,7 +1041,7 @@
 
 // Check that only supported tracking modes have been requested
 for (SessionTrackingMode sessionTrackingMode : sessionTrackingModes) {
-if (!defaultSessionTrackingModes.contains(sessionTrackingMode)) {
+if (!supportedSessionTrackingModes.contains(sessionTrackingMode)) {
 throw new IllegalArgumentException(sm.getString(
 "applicationContext.setSessionTracking.iae.invalid",
 sessionTrackingMode.toString(), getContextPath()));



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

Re: svn re-org imminent

[Mladen Turk]

On 07/08/09 17:34, Mark Thomas wrote:

Mladen Turk wrote:

On 07/08/09 13:41, Mark Thomas wrote:

Just a reminder that once 5.5.28 is released, I am planning to re-org
svn. If you have checkouts of 5.5.x, jk, native, isapi, nsapi this will
affect you.


I am currently planning the following changes:


When done, could you post the changes or even better write down
the new layout somewhere in the wiki?


I was planning to update:
http://tomcat.apache.org/svn.html


Even better ;)

Cheers
--
^TM


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

[RESULT] Release build 5.5.28

[Filip Hanik - Dev Lists]

This vote passed
3xStable binding votes, fhanik,mturk, markt
1xBroken non binding vote, sebb

Filip

On 07/27/2009 02:20 PM, Filip Hanik - Dev Lists wrote:

The candidates binaries are available here:
http://people.apache.org/~fhanik/tomcat/tomcat-5.5/v5.5.28/

According to the release process, the 5.5.28 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable


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





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

[RESULT] jdbc-pool Release build 1.0.7

[Filip Hanik - Dev Lists]

This vote did not pass. Not enough votes.

Filip

On 07/27/2009 02:21 PM, Filip Hanik - Dev Lists wrote:

The candidates source and binaries are available here:
http://people.apache.org/~fhanik/jdbc-pool/v1.0.7/

According to the release process, the 1.0.7 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable


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





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

Re: svn re-org imminent

[Mark Thomas]

Mladen Turk wrote:
> On 07/08/09 13:41, Mark Thomas wrote:
>> Just a reminder that once 5.5.28 is released, I am planning to re-org
>> svn. If you have checkouts of 5.5.x, jk, native, isapi, nsapi this will
>> affect you.
>>
>>
>> I am currently planning the following changes:
>>
> 
> When done, could you post the changes or even better write down
> the new layout somewhere in the wiki?

I was planning to update:
http://tomcat.apache.org/svn.html

Mark



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

Re: svn re-org imminent

[Mladen Turk]

On 07/08/09 13:41, Mark Thomas wrote:

Just a reminder that once 5.5.28 is released, I am planning to re-org
svn. If you have checkouts of 5.5.x, jk, native, isapi, nsapi this will
affect you.


I am currently planning the following changes:



When done, could you post the changes or even better write down
the new layout somewhere in the wiki?


Regards
--
^TM


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

Re: Regarding JmxRemoteLifecycleListener

[Mark Thomas]

Rainer Frey (Inxmail GmbH) wrote:
> On Friday 07 August 2009 15:49:38 Mark Thomas wrote:
>> Rainer Frey wrote:
>>> 1. Revision 751496 was commented with "Tomcat uses Platform MBean server.
>>> Adjust listener accordingly." and removed the separate configuration
>>> for "Catalina" mbean server and registry. Was this accompanied by a
>>> change in tomcat itself, and if so, with which released tomcat version
>>> does the current revision work? Or should I use an older revision with
>>> released tomcat 6?
>> You can either use an older version or patch Tomcat 6.
>> http://svn.apache.org/viewvc?diff_format=h&view=rev&revision=677910
> 
> Thanks for the info, and the amzingly quick answer. Are there plans to add at 
> least this patch to tomcat 6? I will bundle the JmxListener with an 
> application that comes with a tomcat inside, and would prefer to use a binary 
> build for that.
> 
>>> 2. Are there plans to add this listener to Tomcat 6 release?
>> Not at present.
> 
> Was it denied, or never proposed? I remember from messages on the user 
> mailing 
> list you originally wanted to get this ready for 6.0.19.

I never proposed it. I'll propose that and the Platform MBean
simplification for 6.0.x later today.

>>> 3. I think of trying to backport this to Tomcat 5.0 for our internal use.
>>> Do you think this is possible/feasible without knowledge of tomcat code
>>> level internals? What was the situation regarding the mbean servers then?
>> It should be reasonably portable. The listener doesn't touch any Tomcat
>> internals apart from the listener interface, the string manager and the
>> logger. Fixing any issues should be simple. Worst case - delete the
>> references.
> 
> Again, I sould base it on the revision with the additional catalina mbean 
> server, right?

Yes, unless you patch Tomcat.

Mark




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

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

[markt]

Author: markt
Date: Fri Aug  7 15:05:13 2009
New Revision: 802034

URL: http://svn.apache.org/viewvc?rev=802034&view=rev
Log:
Engage brain before reading spec docs and remember that the pdf and the JavaDoc 
are not always consistent.

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=802034&r1=802033&r2=802034&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Aug  7 15:05:13 2009
@@ -79,9 +79,8 @@
   +1: rjung
0: billbarker: generally agree with remm that this is too big of a change 
for the stable branch
  but could agree to some of it if it was split into parts
+   0: markt: Agree with Bill - smaller parts would be better
   -1: remm: no for TC 6.0
-  -1: markt: lastAccessedTime impl is not spec compliant
- Agree with Bill - smaller parts woudl be better
   -1: funkman : api change in Session.java for .x.x release
 
 * Fix Close Stream at WebappClassLoader after read error



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

svn commit: r802032 - in /tomcat/trunk/java/org/apache/catalina: connector/Request.java core/AsyncContextImpl.java

[fhanik]

Author: fhanik
Date: Fri Aug  7 14:58:41 2009
New Revision: 802032

URL: http://svn.apache.org/viewvc?rev=802032&view=rev
Log:
minor refactoring, simplify initialization

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=802032&r1=802031&r2=802032&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Aug  7 
14:58:41 2009
@@ -390,7 +390,7 @@
 /**
  * AsyncContext 
  */
-protected AsyncContextImpl asyncContext = null;
+protected volatile AsyncContextImpl asyncContext = null;
 
 /**
  * async timeout
@@ -1475,9 +1475,7 @@
 if (asyncContext==null) asyncContext = new AsyncContextImpl(this);
 else if (asyncContext.isStarted()) throw new 
IllegalStateException("Already started.");
 asyncContext.setStarted(getContext());
-asyncContext.setServletRequest(request);
-asyncContext.setServletResponse(response);
-asyncContext.initEvent();
+asyncContext.init(request,response);
 //TODO SERVLET3 - async - need to retrieve the ServletContext here
 //or just the webapp classloader associated with to do 
 //run with start(Runnable)

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=802032&r1=802031&r2=802032&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Aug  7 
14:58:41 2009
@@ -232,18 +232,10 @@
 return servletRequest;
 }
 
-public void setServletRequest(ServletRequest servletRequest) {
-this.servletRequest = servletRequest;
-}
-
 public ServletResponse getServletResponse() {
 return servletResponse;
 }
 
-public void setServletResponse(ServletResponse servletResponse) {
-this.servletResponse = servletResponse;
-}
-
 @Override
 public boolean hasOriginalRequestAndResponse() {
 return hasOriginalRequestAndResponse;
@@ -343,8 +335,10 @@
 state.set(AsyncState.TIMING_OUT);
 }
 
-public void initEvent() {
-event = new AsyncEvent(getRequest(),getResponse()); 
+public void init(ServletRequest request, ServletResponse response) {
+this.servletRequest = request;
+this.servletResponse = response;
+event = new AsyncEvent(request,response); 
 }
 
 }



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

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

[markt]

Author: markt
Date: Fri Aug  7 14:58:21 2009
New Revision: 802031

URL: http://svn.apache.org/viewvc?rev=802031&view=rev
Log:
Change vote having read spec more carefully

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=802031&r1=802030&r2=802031&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Aug  7 14:58:21 2009
@@ -76,10 +76,12 @@
 http://svn.apache.org/viewvc?rev=711720&view=rev
 This is not for invalidation, only for displaying
 idle times and making persistance decisions.
-  +1: rjung, markt
+  +1: rjung
0: billbarker: generally agree with remm that this is too big of a change 
for the stable branch
  but could agree to some of it if it was split into parts
   -1: remm: no for TC 6.0
+  -1: markt: lastAccessedTime impl is not spec compliant
+ Agree with Bill - smaller parts woudl be better
   -1: funkman : api change in Session.java for .x.x release
 
 * Fix Close Stream at WebappClassLoader after read error



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

svn commit: r802026 - in /tomcat/trunk: java/javax/servlet/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/examples/WEB-INF/classes/async/

[fhanik]

Author: fhanik
Date: Fri Aug  7 14:49:19 2009
New Revision: 802026

URL: http://svn.apache.org/viewvc?rev=802026&view=rev
Log:
Refactor location of AsyncContextImpl to o.a.catalina.core


Added:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
  - copied, changed from r802006, 
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
  - copied, changed from r802006, 
tomcat/trunk/java/org/apache/catalina/connector/AsyncListenerWrapper.java
Removed:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/connector/AsyncListenerWrapper.java
Modified:
tomcat/trunk/java/javax/servlet/AsyncContext.java
tomcat/trunk/java/javax/servlet/AsyncEvent.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java

Modified: tomcat/trunk/java/javax/servlet/AsyncContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncContext.java?rev=802026&r1=802025&r2=802026&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncContext.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncContext.java Fri Aug  7 14:49:19 2009
@@ -16,7 +16,7 @@
 */
 package javax.servlet;
 
-import org.apache.catalina.connector.AsyncContextImpl.AsyncState;
+import org.apache.catalina.core.AsyncContextImpl.AsyncState;
 
 /**
  * @since Servlet 3.0

Modified: tomcat/trunk/java/javax/servlet/AsyncEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncEvent.java?rev=802026&r1=802025&r2=802026&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncEvent.java Fri Aug  7 14:49:19 2009
@@ -25,7 +25,7 @@
 private ServletRequest request;
 private ServletResponse response;
 
-AsyncEvent(ServletRequest request, ServletResponse response) {
+public AsyncEvent(ServletRequest request, ServletResponse response) {
 this.request = request;
 this.response = response;
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=802026&r1=802025&r2=802026&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Aug  
7 14:49:19 2009
@@ -29,6 +29,7 @@
 import org.apache.catalina.Globals;
 import org.apache.catalina.Wrapper;
 import org.apache.tomcat.util.res.StringManager;
+import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.util.URLEncoder;
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Adapter;
@@ -269,14 +270,8 @@
AsyncContextImpl asyncConImpl = 
(AsyncContextImpl)request.getAsyncContext();
//TODO SERVLET3 - async
//configure settings for timed out
-   
asyncConImpl.setState(AsyncContextImpl.AsyncState.TIMING_OUT);
+   asyncConImpl.setTimeoutState();
 }
-if (status==SocketStatus.TIMEOUT) {
-AsyncContextImpl asyncConImpl = 
(AsyncContextImpl)request.getAsyncContext();
-//TODO SERVLET3 - async
-//configure settings for timed out
-
asyncConImpl.setState(AsyncContextImpl.AsyncState.TIMING_OUT);
- }
 
connector.getContainer().getPipeline().getFirst().invoke(request, response);
 }catch (RuntimeException x) {
 success = false;

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=802026&r1=802025&r2=802026&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Aug  7 
14:49:19 2009
@@ -36,6 +36,7 @@
 
 import javax.security.auth.Subject;
 import javax.servlet.AsyncContext;
+import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterChain;
@@ -62,6 +63,7 @@
 import o

Re: Regarding JmxRemoteLifecycleListener

[Rainer Frey (Inxmail GmbH)]

On Friday 07 August 2009 15:49:38 Mark Thomas wrote:
> Rainer Frey wrote:
> > 1. Revision 751496 was commented with "Tomcat uses Platform MBean server.
> > Adjust listener accordingly." and removed the separate configuration
> > for "Catalina" mbean server and registry. Was this accompanied by a
> > change in tomcat itself, and if so, with which released tomcat version
> > does the current revision work? Or should I use an older revision with
> > released tomcat 6?
>
> You can either use an older version or patch Tomcat 6.
> http://svn.apache.org/viewvc?diff_format=h&view=rev&revision=677910

Thanks for the info, and the amzingly quick answer. Are there plans to add at 
least this patch to tomcat 6? I will bundle the JmxListener with an 
application that comes with a tomcat inside, and would prefer to use a binary 
build for that.

> > 2. Are there plans to add this listener to Tomcat 6 release?
>
> Not at present.

Was it denied, or never proposed? I remember from messages on the user mailing 
list you originally wanted to get this ready for 6.0.19.

> > 3. I think of trying to backport this to Tomcat 5.0 for our internal use.
> > Do you think this is possible/feasible without knowledge of tomcat code
> > level internals? What was the situation regarding the mbean servers then?
>
> It should be reasonably portable. The listener doesn't touch any Tomcat
> internals apart from the listener interface, the string manager and the
> logger. Fixing any issues should be simple. Worst case - delete the
> references.

Again, I sould base it on the revision with the additional catalina mbean 
server, right?

> Mark

Rainer

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

Re: Regarding JmxRemoteLifecycleListener

[Mark Thomas]

Rainer Frey wrote:
> Hi,
> 
> I have some questions about the JmxRemoteLifecycleListerner that was added to 
> trunk.
> 
> 1. Revision 751496 was commented with "Tomcat uses Platform MBean server. 
> Adjust listener accordingly." and removed the separate configuration 
> for "Catalina" mbean server and registry. Was this accompanied by a change in 
> tomcat itself, and if so, with which released tomcat version does the current 
> revision work? Or should I use an older revision with released tomcat 6?

You can either use an older version or patch Tomcat 6.
http://svn.apache.org/viewvc?diff_format=h&view=rev&revision=677910

> 2. Are there plans to add this listener to Tomcat 6 release?
Not at present.

> 3. I think of trying to backport this to Tomcat 5.0 for our internal use. Do 
> you think this is possible/feasible without knowledge of tomcat code level 
> internals? What was the situation regarding the mbean servers then? (I know 
> Tomcat 5.0 is not supported, but perhaps someone can be kind and give a hint; 
> we will upgrade, but it is not possible before a new major release of our 
> software which bundles tomcat).

It should be reasonably portable. The listener doesn't touch any Tomcat
internals apart from the listener interface, the string manager and the
logger. Fixing any issues should be simple. Worst case - delete the
references.

Mark



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

Regarding JmxRemoteLifecycleListener

[Rainer Frey]

Hi,

I have some questions about the JmxRemoteLifecycleListerner that was added to 
trunk.

1. Revision 751496 was commented with "Tomcat uses Platform MBean server. 
Adjust listener accordingly." and removed the separate configuration 
for "Catalina" mbean server and registry. Was this accompanied by a change in 
tomcat itself, and if so, with which released tomcat version does the current 
revision work? Or should I use an older revision with released tomcat 6?

2. Are there plans to add this listener to Tomcat 6 release?

3. I think of trying to backport this to Tomcat 5.0 for our internal use. Do 
you think this is possible/feasible without knowledge of tomcat code level 
internals? What was the situation regarding the mbean servers then? (I know 
Tomcat 5.0 is not supported, but perhaps someone can be kind and give a hint; 
we will upgrade, but it is not possible before a new major release of our 
software which bundles tomcat).

TIA
Rainer

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

svn commit: r801971 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java

[markt]

Author: markt
Date: Fri Aug  7 12:35:06 2009
New Revision: 801971

URL: http://svn.apache.org/viewvc?rev=801971&view=rev
Log:
Remove unnecessary tests and casts

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=801971&r1=801970&r2=801971&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Aug  7 
12:35:06 2009
@@ -31,7 +31,6 @@
 import javax.management.ObjectName;
 
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.ActionHook;
 import org.apache.coyote.Adapter;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.RequestGroupInfo;
@@ -378,9 +377,7 @@
 processor = createProcessor();
 }
 
-if (processor instanceof ActionHook) {
-((ActionHook) processor).action(ActionCode.ACTION_START, 
null);
-}
+processor.action(ActionCode.ACTION_START, null);
 
 if (processor.process(socket)) {
 return SocketState.OPEN;
@@ -409,9 +406,7 @@
 AjpAprProtocol.log.error
 (sm.getString("ajpprotocol.proto.error"), e);
 } finally {
-if (processor instanceof ActionHook) {
-((ActionHook) processor).action(ActionCode.ACTION_STOP, 
null);
-}
+processor.action(ActionCode.ACTION_STOP, null);
 recycledProcessors.offer(processor);
 }
 return SocketState.CLOSED;



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

svn commit: r801969 - in /tomcat/trunk/java/org/apache: catalina/ha/backend/ catalina/session/ tomcat/util/net/

[markt]

Author: markt
Date: Fri Aug  7 12:30:49 2009
New Revision: 801969

URL: http://svn.apache.org/viewvc?rev=801969&view=rev
Log:
Removed unused imports and an unused local variable reported by Eclipse

Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=801969&r1=801968&r2=801969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Fri Aug 
 7 12:30:49 2009
@@ -23,13 +23,10 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.management.ObjectInstance;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.tomcat.util.modeler.Registry;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
 
 /*
  * Listener to provider informations to mod_heartbeat.c

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=801969&r1=801968&r2=801969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Fri 
Aug  7 12:30:49 2009
@@ -20,17 +20,12 @@
 
 import org.apache.catalina.ContainerEvent;
 import org.apache.catalina.ContainerListener;
-import org.apache.catalina.Engine;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
-import org.apache.catalina.connector.Connector;
-
-import org.apache.tomcat.util.modeler.Registry;
-
 /*
  * Listener to provider informations to mod_heartbeat.c
  * *msg_format = "v=%u&ready=%u&busy=%u"; (message to send).
@@ -83,7 +78,7 @@
 }
 
 public void lifecycleEvent(LifecycleEvent event) {
-Object source = event.getLifecycle();
+
 if (Lifecycle.PERIODIC_EVENT.equals(event.getType())) {
 if (sender == null) {
 if (proxyList == null)

Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=801969&r1=801968&r2=801969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Fri Aug  7 
12:30:49 2009
@@ -28,8 +28,6 @@
 import java.io.OutputStreamWriter;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.InetAddress;
-import java.io.UnsupportedEncodingException;
 import java.util.StringTokenizer;
 
 /*

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=801969&r1=801968&r2=801969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Fri Aug  7 
12:30:49 2009
@@ -34,7 +34,6 @@
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
 import org.apache.catalina.Loader;
 import org.apache.catalina.Session;
 import org.apache.catalina.util.CustomObjectInputStream;

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=801969&r1=801968&r2=801969&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Fri Aug  
7 12:30:49 2009
@@ -37,7 +37,6 @@
 import javax.servlet.ServletContext;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
 import org.apache.catalina.Lifecycle;
 import org.apa

svn commit: r801967 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

[markt]

Author: markt
Date: Fri Aug  7 12:24:54 2009
New Revision: 801967

URL: http://svn.apache.org/viewvc?rev=801967&view=rev
Log:
Fix some Eclipse warnings. Could remove the unused parameters but that would 
break the pattern of method signatures

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

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=801967&r1=801966&r2=801967&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Aug  7 
12:24:54 2009
@@ -54,8 +54,6 @@
 import org.apache.coyote.http11.Http11AprProtocol;
 import org.apache.coyote.http11.Http11NioProtocol;
 import org.apache.coyote.http11.Http11Protocol;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.modeler.ManagedBean;
 import org.apache.tomcat.util.modeler.Registry;
@@ -70,11 +68,9 @@
  */
 
 public class MBeanUtils {
-private static Log log = LogFactory.getLog(MBeanUtils.class);
 
 // --- Static Variables
 
-
 /**
  * The set of exceptions to the normal rules used by
  * createManagedBean().  The first element of each pair
@@ -633,7 +629,7 @@
  * @exception MalformedObjectNameException if a name cannot be created
  */
 static ObjectName createObjectName(String domain,
-  Engine engine)
+@SuppressWarnings("unused") Engine engine)
 throws MalformedObjectNameException {
 
 ObjectName name = null;
@@ -801,7 +797,7 @@
  * @exception MalformedObjectNameException if a name cannot be created
  */
 static ObjectName createObjectName(String domain,
-  MBeanFactory factory)
+@SuppressWarnings("unused") MBeanFactory factory)
 throws MalformedObjectNameException {
 
 ObjectName name = new ObjectName(domain + ":type=MBeanFactory");
@@ -879,7 +875,7 @@
  * @exception MalformedObjectNameException if a name cannot be created
  */
 static ObjectName createObjectName(String domain,
-  Server server)
+@SuppressWarnings("unused") Server server)
 throws MalformedObjectNameException {
 
 ObjectName name = null;



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

svn re-org imminent

[Mark Thomas]

Just a reminder that once 5.5.28 is released, I am planning to re-org
svn. If you have checkouts of 5.5.x, jk, native, isapi, nsapi this will
affect you.

My plan to handle this is to:
- check-in what I can beforehand
- re-checkout each of the components to a new location
- copy any locally modified files across
- delete the old checkouts

I am currently planning the following changes:

New stuff
/tc5.5.x
  /trunk
/build  - moved from /build/tc5.5.x
/connectors - moved from /connectors/trunk
/container  - moved from /container/tc5.5.x
/jasper - moved from /jasper/tc5.5.x
/servletapi - moved from /servlet2.4-jsp2.0-tc5.x/
  /branches - empty
  /tags - moved from the build/connector etc dirs
/native
  /trunk- moved from /connectors/trunk/jni
  /branches
/1.1.x  - moved from /connectors/branches/1.1.x/jni
  /tags - moved from /connectors/tags/other
/jk
  /trunk- moved from /connectors/trunk/jni/jk
  /branches
/jk3- moved from /connectors/trunk/jni/jk3

The remaining build, connectors, container etc will be moved to the
archive as will:
/connectors
  /trunk
/ajp
/doc
/scandoc
/util
along with any other old files such as readme.txt

The current directories will be removed.

I'll move the KEYS, NOTICE and LICENSE for Tomcat 5 to the tc5.5.x/trunk
directory.

I'll fix any issues the move makes with the build scripts.

I'll update the svn page on the website.

Mark


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

svn commit: r801944 - /tomcat/trunk/build.xml

[markt]

Author: markt
Date: Fri Aug  7 10:49:54 2009
New Revision: 801944

URL: http://svn.apache.org/viewvc?rev=801944&view=rev
Log:
Modify the embedded target so the extras package can be used if log4j logging 
is required.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=801944&r1=801943&r2=801944&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Aug  7 10:49:54 2009
@@ -92,6 +92,7 @@
 
   
   
+  
 
   
   
@@ -267,7 +268,6 @@
 
 
 
-
 
 
 
@@ -278,7 +278,10 @@
 
 
   
-   
+  
+  
+
+
   
 
 
@@ -667,10 +670,12 @@
   failonerror="false"/>
 
 
-   
+
 
+   filesId="files.tomcat-embed-jasper"/>
+
 
   
 



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

Re: Notice : No more IBM support JK/Tomcat on i5/OS V6R1

[Henri Gomez]

I'll open an incident ticket at IBM, hope they fix that miss.

2009/8/5 Henri Gomez :
>>> Why did we use unixd_set_global_mutex_perms/ap_unixd_set_global_mutex_perms
>>> since both call didn't exist in i5/OS V6R1 and I had to set
>>> JK_NEED_SET_MUTEX_PERMS to 0 to have them excluded.
>>
>> Because otherwise, root created file locking objects are inaccessible to the
>> child process running in a restricted security context.
>>
>> Clear enough?
>>
>> Perhaps the httpd/apr port is whacked.
>
> Very possibile since the AP_NEED_SET_MUTEX_PERMS is set to 1 but I
> couldn't find ap_unixd_set_global_mutex_perms in the various include.
>
> And since IBM didn't profide support anymore for Apache 'modules'
> developpers, I think it will be not be easy to get a reply about the
> APR 1.2 port on i5/OS.
>

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