Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Olivier Lamy]

Hello,

Distro is now ok (at least for unix platform) (common-daemon and
tomcat-native now included).
Some unit test has been fixed (was broken due to path changes), I'm
now at 45 failures on 533 tests (some path changes to fix).
Now I have some fixes to do:
* version build date in docs included in distro
* windauze packaging




2011/12/22 Olivier Lamy :
> Hello,
> I have added the distro packaging (commons-daemon* and
> tomcat-native.tar.gz not yet done).
>
> I still have weird issues which I don't' yet understand:
>
> when runing unit test
> from the top module
>
> mvn clean install -Dtest=TestCompositeELResolver
> 
> GRAVE: Error loading
> jar:file:/Users/olamy/dev/sources/tomcat/tomcat70/tomcat-catalina/target/tomcat-catalina-7.0.24-SNAPSHOT.jar!/org/apache/catalina/mbeans/mbeans-descriptors.xml
> 
>
> or using the generated distro
> mvn clean install -DskipTests
> I have added for testing convenience an exploded distro so:
> cd 
> apache-tomcat/target/apache-tomcat-7.0.24-SNAPSHOT-bin/apache-tomcat-7.0.24-SNAPSHOT/bin/
>
> same error in catalina.out
>
> 22 d<8E>c. 2011 14:21:04 org.apache.tomcat.util.modeler.Registry 
> loadDescriptors
> GRAVE: Error loading
> jar:file:/Users/olamy/dev/sources/tomcat/tomcat70/apache-tomcat/target/apache-tomcat-7.0.24-SNAPSHOT-bin/apache-tomcat-7.0.24-SNAPSHOT/lib/catalina.jar!/org/apache/catalina/mbeans/mbeans-descriptors.xml
>
> I will start debugging.
> For enable debugging in your ide (after the first install of all
> dependent modules), you can use: mvn clean install
> -Dtest=TestCompositeELResolver -pl :tomcat-tests
> -Dmaven.surefire.debug=true
> debug port will be 5005.
>
> Someone with ideas on the exact cause of this ?
>
> 2011/12/21 Olivier Lamy :
>> Hello,
>> I have started some stuff here: https://github.com/olamy/tomcat70.
>>
>> * sources have been to appropriate modules.
>> * I'm now working on some test which fail (some tests need webapp examples)
>> * distro not yet done.
>> * repackaging of dbcp pool, commons-logging is done using shading technology
>> * I will work with jbonofre (who is karaf committer) to add necessary
>> stuff to osgiing.
>>
>> NOTE: It's really work in progress not finish (so pull requests will
>> be accepted :-) )
>>
>> 2011/12/20 Mark Thomas :
>>> On 20/12/2011 08:17, Antonio Petrelli wrote:
 2011/12/19 Mladen Turk 

> On 12/19/2011 07:04 PM, Henri Gomez wrote:
>
>> Exactly. Since any change would require a learning curve
>>> and it seems we don't have that many (read none) maven
>>> experts in the house, Gradle could be equally considered,
>>> given that it seems more advanced in customization.
>>>
>>
>> I know well Maven but Olivier (Lamy) is a Maven expert, so there is
>> friend in the business.
>> And there is a full Maven PMC not too far ready to provide advices and
>> help.
>> Not counting Tomcat consumers ASF projects like OpenEJB.
>>
>>
> All I have seen so far is talk and talk and more talk.
> There is trunk, branches, sandbox, so anyone is free to
> make a proposal and if things work, I'll be the first
> one supporting it.
>

 I already forked my own repository from GitHub. I hope to start it after
 the holidays.
>>>
>>> I would be very interested in seeing what a Mavenised build of trunk
>>> looks like.
>>>
>>> While I may come across as anti-Maven, that is not my position. I am
>>> anti *any* disruptive change that causes more disruption then benefit it
>>> brings and right now I see more disruption than I do benefit.
>>>
>>> I am also wary (from my experience of infrastructure at the ASF) of
>>> folks pushing strongly for a switch to something better, promising to
>>> help with the switch and promising to support things moving forwards and
>>> then melting away just as their support is really needed.
>>>
>>> A demonstration of a fully Mavenised build of Tomcat trunk (or 7.0.x,
>>> 6.0.x or 5.5.x) at GitHub would help considerably:
>>> - we would be able to see how all the potential wrinkles (down-loading
>>> JDT, building a packages renamed DBCP, building a package renamed
>>> Commons logging, etc) were handled in Maven
>>> - we'd be able to judge how much simpler the build process was
>>> - Maven newbies like me could try building it, debugging with it and
>>> developing with it to see how easy we found it
>>> - the work required to create it would demonstrate a commitment to
>>> supporting this change
>>>
>>> I should stress that a working Mavenised build of a version of Tomcat is
>>> necessary but not sufficient to get my support for a switch from Ant to
>>> Maven for the build / release process.
>>>
>>> Mark
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>>
>>
>> --
>> Olivier Lamy
>> Talend: http://coders.talend.com
>> http://twitter.com/olamy

Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Mark Thomas]

On 22/12/2011 13:48, Olivier Lamy wrote:
> In o.a.t.u.m.Registry with changing
> 
> private ModelerSource getModelerSource( String type )
> throws Exception
> {
> if( type==null ) type="MbeansDescriptorsDigesterSource";
> //if( type.indexOf( "" ) < 0 ) {
> if (type.length()>0) {
> type="org.apache.tomcat.util.modeler.modules." + type;
> }
> 
> Class c = Class.forName(type);
> ModelerSource ds=(ModelerSource)c.newInstance();
> return ds;
> }
> 
> package was never added so CNFE.
> I wonder what is the need for this test ?

I've look at the code in trunk and it doesn't look quite like the
snippet above.

I'm not sure I understand that question you are asking. Could you
rephrase it?

As an aside, that is (if it isn't clear) a package renamed version of
commons modeler. I believe it is quite old and hasn't been kept in sync
with the changes in modeler. There is also a fair bit of it that isn't
used and could be removed. Running the unused code detector over the
Tomcat 8 source tree is on the todo list. That should remove a lot of
(what I believe is) unnecessary modeler code.

Mark

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

Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Olivier Lamy]

Hello,

2011/12/23 Mark Thomas :
> On 22/12/2011 13:48, Olivier Lamy wrote:
>> In o.a.t.u.m.Registry with changing
>>
>>     private ModelerSource getModelerSource( String type )
>>             throws Exception
>>     {
>>         if( type==null ) type="MbeansDescriptorsDigesterSource";
>>         //if( type.indexOf( "" ) < 0 ) {
>>         if (type.length()>0) {
>>             type="org.apache.tomcat.util.modeler.modules." + type;
>>         }
>>
>>         Class c = Class.forName(type);
>>         ModelerSource ds=(ModelerSource)c.newInstance();
>>         return ds;
>>     }
>>
>> package was never added so CNFE.
>> I wonder what is the need for this test ?
>
> I've look at the code in trunk and it doesn't look quite like the
> snippet above.

It's on tc7.0.x branch (
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
)

BTW as you said for this maven build poc the best is probably to work
against trunk codebase.

What do you think about I commit some stuff in sandbox path ? (
http://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build )
Maybe it's a path open for all asf committers ? so people interested
to work on that can help ?

Let me know

Thanks
--
Olivier

>
> I'm not sure I understand that question you are asking. Could you
> rephrase it?
>
> As an aside, that is (if it isn't clear) a package renamed version of
> commons modeler. I believe it is quite old and hasn't been kept in sync
> with the changes in modeler. There is also a fair bit of it that isn't
> used and could be removed. Running the unused code detector over the
> Tomcat 8 source tree is on the todo list. That should remove a lot of
> (what I believe is) unnecessary modeler code.
>
> Mark
>
> -
> 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: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Mark Thomas]

On 23/12/2011 12:58, Olivier Lamy wrote:
> Hello,
> 
> 2011/12/23 Mark Thomas :
>> On 22/12/2011 13:48, Olivier Lamy wrote:
>>> In o.a.t.u.m.Registry with changing
>>>
>>> private ModelerSource getModelerSource( String type )
>>> throws Exception
>>> {
>>> if( type==null ) type="MbeansDescriptorsDigesterSource";
>>> //if( type.indexOf( "" ) < 0 ) {
>>> if (type.length()>0) {
>>> type="org.apache.tomcat.util.modeler.modules." + type;
>>> }
>>>
>>> Class c = Class.forName(type);
>>> ModelerSource ds=(ModelerSource)c.newInstance();
>>> return ds;
>>> }
>>>
>>> package was never added so CNFE.
>>> I wonder what is the need for this test ?
>>
>> I've look at the code in trunk and it doesn't look quite like the
>> snippet above.
> 
> It's on tc7.0.x branch (
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
> )
> 
> BTW as you said for this maven build poc the best is probably to work
> against trunk codebase.

In this case trunk and 7.0.x/trunk are identical and neither agree with
the code snippet above. I still do not understand what the question is.

> What do you think about I commit some stuff in sandbox path ? (
> http://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build )
> Maybe it's a path open for all asf committers ? so people interested
> to work on that can help ?

Doing the work in the sandbox would certainly make it more visible so
folks on the dev list can see what is happening more easily. We can get
the relevant part of svn published to the ASF Git mirrors if that helps.

Just my $0.02

Mark

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

svn commit: r1222689 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

[markt]

Author: markt
Date: Fri Dec 23 14:35:30 2011
New Revision: 1222689

URL: http://svn.apache.org/viewvc?rev=1222689&view=rev
Log:
Fix a couple of Eclipse warnings

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1222689&r1=1222688&r2=1222689&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
 Fri Dec 23 14:35:30 2011
@@ -130,14 +130,18 @@ public class MessageDispatchInterceptor 
 return currentSize;
 }
 
-public synchronized long addAndGetCurrentSize(long inc) {
-currentSize += inc;
-return currentSize;
+public long addAndGetCurrentSize(long inc) {
+synchronized (this) {
+currentSize += inc;
+return currentSize;
+}
 }
 
-public synchronized long setAndGetCurrentSize(long value) {
-currentSize = value;
-return value;
+public long setAndGetCurrentSize(long value) {
+synchronized (this) {
+currentSize = value;
+return value;
+}
 }
 
 @Override



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

svn commit: r1222690 - in /tomcat/trunk: java/org/apache/catalina/valves/ExtendedAccessLogValve.java webapps/docs/config/valve.xml

[markt]

Author: markt
Date: Fri Dec 23 14:36:22 2011
New Revision: 1222690

URL: http://svn.apache.org/viewvc?rev=1222690&view=rev
Log:
Avoid deprecated code and provide consistent output regardless of
platform

Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1222690&r1=1222689&r2=1222690&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java 
Fri Dec 23 14:36:22 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
@@ -404,7 +405,12 @@ public class ExtendedAccessLogValve exte
 if (null==value || value.length()==0) {
 return null;
 }
-return URLEncoder.encode(value);
+try {
+return URLEncoder.encode(value, "UTF-8");
+} catch (UnsupportedEncodingException e) {
+// Should never happen - all JVMs are required to support UTF-8
+return null;
+}
 }
 
 @Override

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1222690&r1=1222689&r2=1222690&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Fri Dec 23 14:36:22 2011
@@ -481,7 +481,7 @@
 x-A(XXX) for the servlet context attribute with 
name XXX
 x-C(XXX) for the first cookie with name XXX
 x-O(XXX) for a concatenation of all outgoing 
response headers with name XXX
-x-P(XXX) for the URL encoded request parameter 
with name XXX
+x-P(XXX) for the URL encoded (using UTF-8) request 
parameter with name XXX
 x-R(XXX) for the request attribute with name 
XXX
 x-S(XXX) for the session attribute with name 
XXX
 



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

svn commit: r1222691 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java

[markt]

Author: markt
Date: Fri Dec 23 14:37:03 2011
New Revision: 1222691

URL: http://svn.apache.org/viewvc?rev=1222691&view=rev
Log:
Fix last Eclipse warning in o.a.catalina package

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=1222691&r1=1222690&r2=1222691&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
 Fri Dec 23 14:37:03 2011
@@ -266,6 +266,7 @@ public class OrderInterceptor extends Ch
 return counter;
 }
 
+@SuppressWarnings("null") // prev cannot be null
 public static MessageOrder add(MessageOrder head, MessageOrder add) {
 if ( head == null ) return add;
 if ( add == null ) return head;
@@ -288,7 +289,7 @@ public class OrderInterceptor extends Ch
 iter.next = add;
 } else if (iter.getMsgNr() > add.getMsgNr()) {
 //add before
-prev.next = add;
+prev.next = add; // prev cannot be null here, warning 
suppressed
 add.next = iter;
 
 } else {



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

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

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #21 from r...@symentis.com 2011-12-23 14:49:21 UTC ---
+1

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Olivier Lamy]

2011/12/23 Mark Thomas :
> On 23/12/2011 12:58, Olivier Lamy wrote:
>> Hello,
>>
>> 2011/12/23 Mark Thomas :
>>> On 22/12/2011 13:48, Olivier Lamy wrote:
 In o.a.t.u.m.Registry with changing

     private ModelerSource getModelerSource( String type )
             throws Exception
     {
         if( type==null ) type="MbeansDescriptorsDigesterSource";
         //if( type.indexOf( "" ) < 0 ) {
         if (type.length()>0) {
             type="org.apache.tomcat.util.modeler.modules." + type;
         }

         Class c = Class.forName(type);
         ModelerSource ds=(ModelerSource)c.newInstance();
         return ds;
     }

 package was never added so CNFE.
 I wonder what is the need for this test ?
>>>
>>> I've look at the code in trunk and it doesn't look quite like the
>>> snippet above.
>>
>> It's on tc7.0.x branch (
>> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
>> )
>>
>> BTW as you said for this maven build poc the best is probably to work
>> against trunk codebase.
>
> In this case trunk and 7.0.x/trunk are identical and neither agree with
> the code snippet above. I still do not understand what the question is.

Ok I miss to explain correctly, the snippet contains change I have
made to get that working.

see 
https://github.com/olamy/tomcat70/commit/3cbc6d910c50a1542075b0a2d68de1dac00f2ac0
Without this change package was not added so I add some CNFE.


>
>> What do you think about I commit some stuff in sandbox path ? (
>> http://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build )
>> Maybe it's a path open for all asf committers ? so people interested
>> to work on that can help ?
>
> Doing the work in the sandbox would certainly make it more visible so
> folks on the dev list can see what is happening more easily. We can get
> the relevant part of svn published to the ASF Git mirrors if that helps.

K I will

>
> Just my $0.02
>
> Mark
>
> -
> 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: r1222700 - /tomcat/sandbox/trunk-mvn-build/

[olamy]

Author: olamy
Date: Fri Dec 23 15:18:24 2011
New Revision: 1222700

URL: http://svn.apache.org/viewvc?rev=1222700&view=rev
Log:
create a branch for building trunk with maven


Added:
tomcat/sandbox/trunk-mvn-build/
  - copied from r1222699, tomcat/trunk/


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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test :  Tomcat 7.x, a web server implementing Java Servlet 
3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 mins 23 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-23122011.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-23122011-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-23122011-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-23122011.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/worksp
 ace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-23122011.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
 
0.x/tomcat-deps/tomcat-dbcp-23122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-23122011.jar:/srv/gump/public/workspace/junit/dist/junit-23122011.jar

Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)

[Mark Thomas]

On 23/12/2011 15:13, Olivier Lamy wrote:
> 2011/12/23 Mark Thomas :
>> On 23/12/2011 12:58, Olivier Lamy wrote:
>>> Hello,
>>>
>>> 2011/12/23 Mark Thomas :
 On 22/12/2011 13:48, Olivier Lamy wrote:
> In o.a.t.u.m.Registry with changing
>
> private ModelerSource getModelerSource( String type )
> throws Exception
> {
> if( type==null ) type="MbeansDescriptorsDigesterSource";
> //if( type.indexOf( "" ) < 0 ) {
> if (type.length()>0) {
> type="org.apache.tomcat.util.modeler.modules." + type;
> }
>
> Class c = Class.forName(type);
> ModelerSource ds=(ModelerSource)c.newInstance();
> return ds;
> }
>
> package was never added so CNFE.
> I wonder what is the need for this test ?



> Ok I miss to explain correctly, the snippet contains change I have
> made to get that working.
> 
> see 
> https://github.com/olamy/tomcat70/commit/3cbc6d910c50a1542075b0a2d68de1dac00f2ac0
> Without this change package was not added so I add some CNFE.

OK. That change looks wrong to me. The original code is what I would
expect. It is odd that it isn't working if all. The class should be
present. Can you debug it and see what type is on entry to that method?
Maybe the .xml descriptor files aren't where they are expected to be.

Mark

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

svn commit: r1222718 - /tomcat/sandbox/trunk-mvn-build/pom.xml

[olamy]

Author: olamy
Date: Fri Dec 23 16:14:38 2011
New Revision: 1222718

URL: http://svn.apache.org/viewvc?rev=1222718&view=rev
Log:
missed to add parent pom

Added:
tomcat/sandbox/trunk-mvn-build/pom.xml   (with props)

Added: tomcat/sandbox/trunk-mvn-build/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/pom.xml?rev=1222718&view=auto
==
--- tomcat/sandbox/trunk-mvn-build/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/pom.xml Fri Dec 23 16:14:38 2011
@@ -0,0 +1,143 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+  4.0.0
+
+  
+org.apache
+apache
+9
+  
+
+  org.apache.tomcat
+  tomcat-parent
+  7.0.24-SNAPSHOT
+  pom
+
+  Apache Tomcat
+  http://tomcat.apache.org
+
+  
+1.6
+1.6
+ISO-8859-1
+true
+
+ISO-8859-1
+false
+  
+
+
+  
+tomcat-juli
+tomcat-annotations-api
+tomcat-servlet-api
+tomcat-mail-api
+tomcat-api
+tomcat-util
+tomcat-coyote
+tomcat-catalina
+tomcat-catalina-ant
+tomcat-tribes
+tomcat-catalina-ha
+tomcat-catalina-jmx-remote
+tomcat-catalina-ws
+tomcat-dbcp
+tomcat-el-api
+tomcat-jsp-api
+tomcat-jasper-el
+tomcat-jasper
+tomcat-embed-logging-juli
+tomcat-embed-logging-log4j
+tomcat-embed-core
+tomcat-embed-jasper
+tomcat-extras-juli-adapters
+tomcat-i18n-es
+tomcat-i18n-fr
+tomcat-i18n-ja
+tomcat-webapps
+tomcat-tests
+bootstrap
+apache-tomcat
+  
+
+  
+
+  
+
+
+  
+
+  
+
+
+  org.apache.maven.plugins
+  maven-clean-plugin
+  2.4.1
+
+
+
+  org.apache.maven.plugins
+  maven-compiler-plugin
+  2.3.2
+  
+${compiler.source}
+${compiler.target}
+${compiler.debug}
+${compiler.encoding}
+  
+
+
+
+  org.apache.maven.plugins
+  maven-surefire-plugin
+  2.11
+
+
+
+  org.apache.maven.plugins
+  maven-war-plugin
+  2.1.1
+
+
+
+  org.apache.maven.plugins
+  maven-enforcer-plugin
+  1.0.1
+  
+
+  
+
+  
+
+
+
+  org.apache.felix
+  maven-bundle-plugin
+  2.3.6
+  true
+
+
+  
+
+  
+
+
+

Propchange: tomcat/sandbox/trunk-mvn-build/pom.xml
--
svn:eol-style = native

Propchange: tomcat/sandbox/trunk-mvn-build/pom.xml
--
svn:keywords = Author Date Id Revision



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

svn commit: r1222730 - in /tomcat/sandbox/trunk-mvn-build: ./ apache-tomcat/ bootstrap/ tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-

[olamy]

Author: olamy
Date: Fri Dec 23 16:27:08 2011
New Revision: 1222730

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

Modified:
tomcat/sandbox/trunk-mvn-build/   (props changed)
tomcat/sandbox/trunk-mvn-build/apache-tomcat/   (props changed)
tomcat/sandbox/trunk-mvn-build/bootstrap/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-juli/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-log4j/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-extras-juli-adapters/   (props 
changed)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-ja/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-juli/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-tests/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-util/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/   (props 
changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/   (props changed)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/   (props changed)

Propchange: tomcat/sandbox/trunk-mvn-build/
--
--- svn:ignore (original)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -4,3 +4,4 @@ build.properties
 work
 logs
 *.iml
+target

Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/bootstrap/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-api/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/
--
--- svn:ignore (added)
+++ svn:ignore Fri Dec 23 16:27:08 2011
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+.settings

Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/
-

svn commit: r1222735 - in /tomcat/sandbox/trunk-mvn-build: java/javax/annotation/ java/javax/ejb/ java/javax/persistence/ java/javax/xml/ tomcat-annotations-api/src/ tomcat-annotations-api/src/main/ t

[olamy]

Author: olamy
Date: Fri Dec 23 16:33:04 2011
New Revision: 1222735

URL: http://svn.apache.org/viewvc?rev=1222735&view=rev
Log:
move annotations sources to tomcat-annotations-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/javax/

tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/javax/annotation/
  - copied from r1222729, 
tomcat/sandbox/trunk-mvn-build/java/javax/annotation/

tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/javax/ejb/
  - copied from r1222729, tomcat/sandbox/trunk-mvn-build/java/javax/ejb/

tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/javax/persistence/
  - copied from r1222729, 
tomcat/sandbox/trunk-mvn-build/java/javax/persistence/

tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/src/main/java/javax/xml/
  - copied from r1222729, tomcat/sandbox/trunk-mvn-build/java/javax/xml/
Removed:
tomcat/sandbox/trunk-mvn-build/java/javax/annotation/
tomcat/sandbox/trunk-mvn-build/java/javax/ejb/
tomcat/sandbox/trunk-mvn-build/java/javax/persistence/
tomcat/sandbox/trunk-mvn-build/java/javax/xml/


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

svn commit: r1222737 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/juli/ tomcat-juli/src/ tomcat-juli/src/main/ tomcat-juli/src/main/java/ tomcat-juli/src/main/java/org/ tomcat-juli/src/main/j

[olamy]

Author: olamy
Date: Fri Dec 23 16:35:55 2011
New Revision: 1222737

URL: http://svn.apache.org/viewvc?rev=1222737&view=rev
Log:
move juli package sources to tomcat-juli module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/main/java/org/apache/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/src/main/java/org/apache/juli/
  - copied from r1222729, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/juli/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/juli/


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

svn commit: r1222741 - in /tomcat/sandbox/trunk-mvn-build: java/javax/servlet/jsp/ tomcat-jsp-api/src/ tomcat-jsp-api/src/main/ tomcat-jsp-api/src/main/java/ tomcat-jsp-api/src/main/java/javax/ tomcat

[olamy]

Author: olamy
Date: Fri Dec 23 16:43:30 2011
New Revision: 1222741

URL: http://svn.apache.org/viewvc?rev=1222741&view=rev
Log:
move javax.servlet.jsp package sources to tomcat-jsp-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/main/java/javax/
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/main/java/javax/servlet/

tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/src/main/java/javax/servlet/jsp/
  - copied from r1222729, 
tomcat/sandbox/trunk-mvn-build/java/javax/servlet/jsp/
Removed:
tomcat/sandbox/trunk-mvn-build/java/javax/servlet/jsp/


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

svn commit: r1222744 - in /tomcat/sandbox/trunk-mvn-build: java/javax/servlet/ tomcat-servlet-api/ tomcat-servlet-api/src/ tomcat-servlet-api/src/main/ tomcat-servlet-api/src/main/java/ tomcat-servlet

[olamy]

Author: olamy
Date: Fri Dec 23 16:47:48 2011
New Revision: 1222744

URL: http://svn.apache.org/viewvc?rev=1222744&view=rev
Log:
move javax.servlet package sources to tomcat-servlet-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/

tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/
  - copied from r1222729, tomcat/sandbox/trunk-mvn-build/java/javax/servlet/
Removed:
tomcat/sandbox/trunk-mvn-build/java/javax/servlet/

tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/jsp/
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml?rev=1222744&r1=1222743&r2=1222744&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml Fri Dec 23 
16:47:48 2011
@@ -40,7 +40,7 @@
 src/main/java
 
   **/mbeans-descriptors.xml
-  **/LocalStrings.properties
+  **/*.properties
 
   
   



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

svn commit: r1222745 - in /tomcat/sandbox/trunk-mvn-build: java/javax/mail/ tomcat-mail-api/src/ tomcat-mail-api/src/main/ tomcat-mail-api/src/main/java/ tomcat-mail-api/src/main/java/javax/ tomcat-ma

[olamy]

Author: olamy
Date: Fri Dec 23 16:49:32 2011
New Revision: 1222745

URL: http://svn.apache.org/viewvc?rev=1222745&view=rev
Log:
move javax.mail package sources to tomcat-mail-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/src/main/java/javax/
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/src/main/java/javax/mail/
  - copied from r1222743, tomcat/sandbox/trunk-mvn-build/java/javax/mail/
Removed:
tomcat/sandbox/trunk-mvn-build/java/javax/mail/


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

svn commit: r1222747 - in /tomcat/sandbox/trunk-mvn-build: java/javax/el/ tomcat-el-api/pom.xml tomcat-el-api/src/ tomcat-el-api/src/main/ tomcat-el-api/src/main/java/ tomcat-el-api/src/main/java/java

[olamy]

Author: olamy
Date: Fri Dec 23 16:51:51 2011
New Revision: 1222747

URL: http://svn.apache.org/viewvc?rev=1222747&view=rev
Log:
move javax.el package sources to tomcat-el-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/main/java/javax/
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/main/java/javax/el/
  - copied from r1222743, tomcat/sandbox/trunk-mvn-build/java/javax/el/
Removed:
tomcat/sandbox/trunk-mvn-build/java/javax/el/
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml?rev=1222747&r1=1222746&r2=1222747&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml Fri Dec 23 16:51:51 
2011
@@ -37,7 +37,7 @@
 src/main/java
 
   **/mbeans-descriptors.xml
-  **/LocalStrings.properties
+  **/*.properties
 
   
 



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

svn commit: r1222749 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/tomcat/ tomcat-api/src/ tomcat-api/src/main/ tomcat-api/src/main/java/ tomcat-api/src/main/java/org/ tomcat-api/src/main/java

[olamy]

Author: olamy
Date: Fri Dec 23 16:55:36 2011
New Revision: 1222749

URL: http://svn.apache.org/viewvc?rev=1222749&view=rev
Log:
move tomcat api classes to tomcat-api module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/
tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/tomcat/

tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/tomcat/InstanceManager.java
  - copied unchanged from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/InstanceManager.java

tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/tomcat/JarScanner.java
  - copied unchanged from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/JarScanner.java

tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/tomcat/JarScannerCallback.java
  - copied unchanged from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/JarScannerCallback.java

tomcat/sandbox/trunk-mvn-build/tomcat-api/src/main/java/org/apache/tomcat/PeriodicEventListener.java
  - copied unchanged from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/PeriodicEventListener.java
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/InstanceManager.java
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/JarScanner.java

tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/JarScannerCallback.java

tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/PeriodicEventListener.java


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

svn commit: r1222751 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/naming/factory/webservices/ tomcat-catalina-ws/src/ tomcat-catalina-ws/src/main/ tomcat-catalina-ws/src/main/java/ tomcat-cat

[olamy]

Author: olamy
Date: Fri Dec 23 17:00:35 2011
New Revision: 1222751

URL: http://svn.apache.org/viewvc?rev=1222751&view=rev
Log:
move org/apache/naming/factory/webservices to tomcat-catalina-ws module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/org/apache/naming/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/org/apache/naming/factory/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/src/main/java/org/apache/naming/factory/webservices/
  - copied from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/naming/factory/webservices/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/naming/factory/webservices/


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

svn commit: r1222752 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/naming/ tomcat-catalina/src/main/java/org/apache/naming/ tomcat-catalina/src/main/java/org/apache/naming/factory/webservices/

[olamy]

Author: olamy
Date: Fri Dec 23 17:03:18 2011
New Revision: 1222752

URL: http://svn.apache.org/viewvc?rev=1222752&view=rev
Log:
org.apache.naming sources to tomcat-catalina module

Added:

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/naming/
  - copied from r1222743, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/naming/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/naming/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/naming/factory/webservices/


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

svn commit: r1222753 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/catalina/ha/ tomcat-catalina-ha/src/ tomcat-catalina-ha/src/main/ tomcat-catalina-ha/src/main/java/ tomcat-catalina-ha/src/ma

[olamy]

Author: olamy
Date: Fri Dec 23 17:05:15 2011
New Revision: 1222753

URL: http://svn.apache.org/viewvc?rev=1222753&view=rev
Log:
move org.apache.catalina.ha package to tomcat-catalina-ha module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/apache/catalina/ha/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/ha/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/ha/


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

svn commit: r1222755 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/tomcat/util/file/ java/org/apache/tomcat/util/res/ java/org/apache/tomcat/util/scan/ tomcat-util/src/ tomcat-util/src/main/ t

[olamy]

Author: olamy
Date: Fri Dec 23 17:09:54 2011
New Revision: 1222755

URL: http://svn.apache.org/viewvc?rev=1222755&view=rev
Log:
move util classes to tomcat-util module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/
tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/tomcat/

tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/tomcat/util/

tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/tomcat/util/file/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/file/

tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/tomcat/util/res/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/res/

tomcat/sandbox/trunk-mvn-build/tomcat-util/src/main/java/org/apache/tomcat/util/scan/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/scan/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/file/
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/res/
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/scan/


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

Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/ tomc

[Mark Thomas]

On 23/12/2011 16:10, ol...@apache.org wrote:
> Author: olamy
> Date: Fri Dec 23 16:10:56 2011
> New Revision: 1222717
> 
> URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
> Log:
> start adding maven poms and modules structure

One thing that does come to mind is that this is a lot of work being
done that might come to nothing. Of course, you are free to scratch your
own itch but I wondered if you thought about looking at the current ant
file Tomcat uses to create the Maven artifacts and seeing if there was
some room for improvement. Clearly, there hasn't been much Maven
expertise around here until recently and improving the current process
may end up being more productive. For example, a fix for [1] that used
the current build process would be very helpful.

Mark

[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52381

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

svn commit: r1222796 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java

[markt]

Author: markt
Date: Fri Dec 23 19:02:16 2011
New Revision: 1222796

URL: http://svn.apache.org/viewvc?rev=1222796&view=rev
Log:
Remove unused class

Removed:

tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java


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

svn commit: r1222797 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: ManagedBean.java modules/MbeansDescriptorsDOMSource.java modules/MbeansDescriptorsDigesterSource.java modules/MbeansDescrip

[markt]

Author: markt
Date: Fri Dec 23 19:03:08 2011
New Revision: 1222797

URL: http://svn.apache.org/viewvc?rev=1222797&view=rev
Log:
Remove commented out code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1222797&r1=1222796&r2=1222797&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Fri Dec 
23 19:03:08 2011
@@ -68,13 +68,11 @@ public class ManagedBean implements java
 new HashMap();
 
 protected String className = BASE_MBEAN;
-//protected ConstructorInfo constructors[] = new ConstructorInfo[0];
 protected String description = null;
 protected String domain = null;
 protected String group = null;
 protected String name = null;
 
-//protected List fields = new ArrayList();
 protected NotificationInfo notifications[] = new NotificationInfo[0];
 protected String type = null;
 
@@ -119,14 +117,6 @@ public class ManagedBean implements java
 }
 
 
-///**
-// * The collection of constructors for this MBean.
-// */
-//public ConstructorInfo[] getConstructors() {
-//return (this.constructors);
-//}
-
-
 /**
  * The human-readable description of this MBean.
  */
@@ -154,16 +144,6 @@ public class ManagedBean implements java
 
 
 /**
- * Return a List of the {@link FieldInfo} objects for
- * the name/value pairs that should be
- * added to the Descriptor created from this metadata.
- */
-//public List getFields() {
-//return (this.fields);
-//}
-//
-
-/**
  * The (optional) group to which this MBean belongs.
  */
 public String getGroup() {
@@ -236,36 +216,6 @@ public class ManagedBean implements java
 
 
 /**
- * Add a new constructor to the set of constructors for this MBean.
- *
- * @param constructor The new constructor descriptor
- */
-//public void addConstructor(ConstructorInfo constructor) {
-//
-//synchronized (constructors) {
-//ConstructorInfo results[] =
-//new ConstructorInfo[constructors.length + 1];
-//System.arraycopy(constructors, 0, results, 0, 
constructors.length);
-//results[constructors.length] = constructor;
-//constructors = results;
-//this.info = null;
-//}
-//
-//}
-
-
-/**
- * Add a new field to the fields associated with the
- * Descriptor that will be created from this metadata.
- *
- * @param field The field to be added
- */
-//public void addField(FieldInfo field) {
-//fields.add(field);
-//}
-
-
-/**
  * Add a new notification to the set of notifications for this MBean.
  *
  * @param notification The new notification descriptor
@@ -421,12 +371,6 @@ public class ManagedBean implements java
 operations[i] = opers[i].createOperationInfo();
 
 
-//ConstructorInfo consts[] = getConstructors();
-//ModelMBeanConstructorInfo constructors[] =
-//new ModelMBeanConstructorInfo[consts.length];
-//for (int i = 0; i < consts.length; i++)
-//constructors[i] = consts[i].createConstructorInfo();
-
 NotificationInfo notifs[] = getNotifications();
 MBeanNotificationInfo notifications[] =
 new MBeanNotificationInfo[notifs.length];
@@ -441,17 +385,6 @@ public class ManagedBean implements java
  new MBeanConstructorInfo[] {},
  operations,
  notifications);
-//try {
-//Descriptor descriptor = info.getMBeanDescriptor();
-//Iterator fields = getFields().iterator();
-//while (fields.hasNext()) {
-//FieldInfo field = (FieldInfo) fields.next();
-//descriptor.setField(field.getName(), field.getValue());
-//}
-//info.setMBeanDescriptor(descriptor);
-//} catch (MBeanException e) {
-//;
-//}
 
 return (info);
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java?rev=1222797&r1=1222796&r2=1222797&view=diff
==

svn commit: r1222798 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: ConstructorInfo.java FeatureInfo.java

[markt]

Author: markt
Date: Fri Dec 23 19:03:49 2011
New Revision: 1222798

URL: http://svn.apache.org/viewvc?rev=1222798&view=rev
Log:
Remove unused class

Removed:
tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java?rev=1222798&r1=1222797&r2=1222798&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java Fri Dec 
23 19:03:49 2011
@@ -25,10 +25,9 @@ import javax.management.MBeanFeatureInfo
 
 
 /**
- * Convenience base class for AttributeInfo,
- * ConstructorInfo, and OperationInfo classes
- * that will be used to collect configuration information for the
- * ModelMBean beans exposed for management.
+ * Convenience base class for AttributeInfo and
+ * OperationInfo classes that will be used to collect 
configuration
+ * information for the ModelMBean beans exposed for 
management.
  *
  * @author Craig R. McClanahan
  * @version $Id$



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

svn commit: r1222800 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java

[markt]

Author: markt
Date: Fri Dec 23 19:04:27 2011
New Revision: 1222800

URL: http://svn.apache.org/viewvc?rev=1222800&view=rev
Log:
Remove unused inner class

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1222800&r1=1222799&r2=1222800&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Fri 
Dec 23 19:04:27 2011
@@ -1154,42 +1154,4 @@ public class BaseModelMBean implements D
 ((MBeanRegistration)resource).postDeregister();
 }
 }
-
-static class MethodKey {
-private String name;
-private String[] signature;
-
-MethodKey(String name, String[] signature) {
-this.name = name;
-if(signature == null) {
-signature = new String[0];
-}
-this.signature = signature;
-}
-
-@Override
-public boolean equals(Object other) {
-if(!(other instanceof MethodKey)) {
-return false;
-}
-MethodKey omk = (MethodKey)other;
-if(!name.equals(omk.name)) {
-return false;
-}
-if(signature.length != omk.signature.length) {
-return false;
-}
-for(int i=0; i < signature.length; i++) {
-if(!signature[i].equals(omk.signature[i])) {
-return false;
-}
-}
-return true;
-}
-
-@Override
-public int hashCode() {
-return name.hashCode();
-}
-}
 }



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

svn commit: r1222801 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java

[markt]

Author: markt
Date: Fri Dec 23 19:05:07 2011
New Revision: 1222801

URL: http://svn.apache.org/viewvc?rev=1222801&view=rev
Log:
Remove unused class

Removed:

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java


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

svn commit: r1222802 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Fri Dec 23 19:05:46 2011
New Revision: 1222802

URL: http://svn.apache.org/viewvc?rev=1222802&view=rev
Log:
Remove unused code.
Make fields final where appropriate.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1222802&r1=1222801&r2=1222802&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Dec 23 
19:05:46 2011
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.management.ManagementFactory;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -82,7 +81,7 @@ public class Registry implements Registr
 
 /** Will be used to isolate different apps and enhance security.
  */
-private static HashMap perLoaderRegistries = null;
+private static final HashMap perLoaderRegistries = null;
 
 /**
  * The registry instance created by our factory method the first time
@@ -117,9 +116,9 @@ public class Registry implements Registr
 
 // Id - small ints to use array access. No reset on stop()
 // Used for notifications
-private Hashtable> idDomains =
+private final Hashtable> idDomains =
 new Hashtable>();
-private Hashtable ids = new Hashtable();
+private final Hashtable ids = new Hashtable();
 
 
 // --- Constructors
@@ -183,20 +182,6 @@ public class Registry implements Registr
 return (registry);
 }
 
-/**
- * Allow containers to isolate apps. Can be called only once.
- * It  is highly recommended you call this method if using Registry in
- * a container environment. The default is false for backward compatibility
- *
- * @param enable
- * @since 1.1
- */
-public static void setUseContextClassLoader( boolean enable ) {
-if( enable ) {
-perLoaderRegistries = new HashMap();
-}
-}
-
 //  Generic methods  
 
 /** Lifecycle method - clean up the registry metadata.
@@ -411,57 +396,6 @@ public class Registry implements Registr
 return mb;
 }
 
-/**
- * Return the set of bean names for all managed beans known to
- * this registry.
- *
- * @since 1.0
- */
-public String[] findManagedBeans() {
-return descriptors.keySet().toArray(new String[0]);
-}
-
-
-/**
- * Return the set of bean names for all managed beans known to
- * this registry that belong to the specified group.
- *
- * @param group Name of the group of interest, or null
- *  to select beans that do not belong to a group
- * @since 1.0
- */
-public String[] findManagedBeans(String group) {
-
-ArrayList results = new ArrayList();
-Iterator items = descriptors.values().iterator();
-while (items.hasNext()) {
-ManagedBean item = items.next();
-if ((group == null)) {
-if (item.getGroup() == null){
-results.add(item.getName());
-}
-} else if (group.equals(item.getGroup())) {
-results.add(item.getName());
-}
-}
-String values[] = new String[results.size()];
-return results.toArray(values);
-
-}
-
-
-/**
- * Remove an existing bean from the set of beans known to this registry.
- *
- * @param bean The managed bean to be removed
- * @since 1.0
- */
-public void removeManagedBean(ManagedBean bean) {
-   // TODO: change this to use group/name
-descriptors.remove(bean.getName());
-descriptorsByClass.remove( bean.getType());
-}
-
 //  Helpers  
 
 /** Get the type of an attribute of the object, from the metadata.
@@ -895,19 +829,4 @@ public class Registry implements Registr
 {
 return findManagedBean(null, beanClass, type);
 }
-
-/**
- * Set the MBeanServer to be utilized for our
- * registered management beans.
- *
- * @param server The new MBeanServer instance
- */
-public void setMBeanServer( MBeanServer server ) {
-this.server=server;
-}
-
-public void resetMetadata() {
-stop();
-}
-
 }



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

svn commit: r1222803 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Fri Dec 23 19:06:25 2011
New Revision: 1222803

URL: http://svn.apache.org/viewvc?rev=1222803&view=rev
Log:
Simplify search since Tomcat only uses xml descriptors

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1222803&r1=1222802&r2=1222803&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Dec 23 
19:06:25 2011
@@ -709,31 +709,21 @@ public class Registry implements Registr
 if( searchedPaths.get( packageName ) != null ) {
 return;
 }
-String descriptors=res + "/mbeans-descriptors.ser";
 
-URL dURL=classLoader.getResource( descriptors );
+String descriptors = res + "/mbeans-descriptors.xml";
+URL dURL = classLoader.getResource( descriptors );
 
-if( dURL == null ) {
-descriptors=res + "/mbeans-descriptors.xml";
-dURL=classLoader.getResource( descriptors );
-}
-if( dURL == null ) {
+if (dURL == null) {
 return;
 }
 
 log.debug( "Found " + dURL);
 searchedPaths.put( packageName,  dURL );
 try {
-if( descriptors.endsWith(".xml" ))
-loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);
-else
-loadDescriptors("MbeansDescriptorsSerSource", dURL, null);
-return;
+loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);
 } catch(Exception ex ) {
 log.error("Error loading " + dURL);
 }
-
-return;
 }
 
 /**



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

svn commit: r1222804 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Fri Dec 23 19:07:04 2011
New Revision: 1222804

URL: http://svn.apache.org/viewvc?rev=1222804&view=rev
Log:
Remove pointless private method

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1222804&r1=1222803&r2=1222804&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Dec 23 
19:07:04 2011
@@ -231,7 +231,7 @@ public class Registry implements Registr
  */
 @Override
 public void loadMetadata(Object source ) throws Exception {
-loadDescriptors( null, source, null );
+load( null, source, null );
 }
 
 /** Register a bean by creating a modeler mbean and adding it to the
@@ -520,8 +520,7 @@ public class Registry implements Registr
 log.debug( "Dynamic mbean support ");
 }
 // Dynamic mbean
-loadDescriptors("MbeansDescriptorsDynamicMBeanSource",
-bean, type);
+load("MbeansDescriptorsDynamicMBeanSource", bean, type);
 
 managed=findManagedBean(type);
 }
@@ -533,8 +532,7 @@ public class Registry implements Registr
 }
 
 // introspection
-loadDescriptors("MbeansDescriptorsIntrospectionSource",
-beanClass, type);
+load("MbeansDescriptorsIntrospectionSource", beanClass, type);
 
 managed=findManagedBean(type);
 if( managed==null ) {
@@ -720,24 +718,12 @@ public class Registry implements Registr
 log.debug( "Found " + dURL);
 searchedPaths.put( packageName,  dURL );
 try {
-loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);
+load("MbeansDescriptorsDigesterSource", dURL, null);
 } catch(Exception ex ) {
 log.error("Error loading " + dURL);
 }
 }
 
-/**
- * @param sourceType
- * @param source
- * @param param
- * @throws Exception
-
- */
-private void loadDescriptors(String sourceType, Object source,
-String param) throws Exception {
-load(sourceType, source, param);
-}
-
 /** Lookup the component descriptor in the package and
  * in the parent packages.
  *



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

svn commit: r1222809 - in /tomcat/trunk/java/org/apache: catalina/ha/jmx/ClusterJmxHelper.java tomcat/util/modeler/Registry.java tomcat/util/modeler/RegistryMBean.java

[markt]

Author: markt
Date: Fri Dec 23 19:28:58 2011
New Revision: 1222809

URL: http://svn.apache.org/viewvc?rev=1222809&view=rev
Log:
More unused code removal.
A little refactoring to allow some methods to be removed to simplify
later refactoring

Modified:
tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java?rev=1222809&r1=1222808&r2=1222809&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java Fri Dec 
23 19:28:58 2011
@@ -37,12 +37,10 @@ import org.apache.tomcat.util.modeler.Re
  */
 public class ClusterJmxHelper {
 
-protected static Registry registry = Registry.getRegistry(null,null);
+protected static final Registry registry = Registry.getRegistry(null,null);
 
 private static final Log log = LogFactory.getLog(ClusterJmxHelper.class);
 
-protected static boolean jmxEnabled = true;
-
 protected static MBeanServer mbeanServer = null;
 
 public static Registry getRegistry() {
@@ -63,7 +61,8 @@ public class ClusterJmxHelper {
 protected static boolean initMetaData(Class clazz) {
 try {
 if (clazz==null) return false;
-
getRegistry().loadMetadata(clazz.getResourceAsStream("mbeans-descriptors.xml"));
+getRegistry().load(null,
+clazz.getResourceAsStream("mbeans-descriptors.xml"), null);
 }catch (Exception x) {
 log.warn("Unable to load meta data for class:"+clazz.getName());
 return false;

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1222809&r1=1222808&r2=1222809&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Dec 23 
19:28:58 2011
@@ -196,44 +196,6 @@ public class Registry implements Registr
 searchedPaths=new HashMap();
 }
 
-/**
- * Load an extended mlet file. The source can be an URL, File or
- * InputStream.
- *
- * All mbeans will be instantiated, registered and the attributes will be
- * set. The result is a list of ObjectNames.
- *
- * @param source InputStream or URL of the file
- * @param cl ClassLoader to be used to load the mbeans, or null to use the
- *default JMX mechanism ( i.e. all registered loaders )
- * @return List of ObjectName for the loaded mbeans
- * @throws Exception
- *
- * @since 1.1
- */
-@Override
-public List loadMBeans( Object source, ClassLoader cl )
-throws Exception
-{
-return load("MbeansSource", source, null );
-}
-
-
-/** Load descriptors. The source can be a File or URL or InputStream for 
the
- * descriptors file. In the case of File and URL, if the extension is 
".ser"
- * a serialized version will be loaded.
- *
- * This method should be used to explicitly load metadata - but this is not
- * required in most cases. The registerComponent() method will find 
metadata
- * in the same package.
- *
- * @param source
- */
-@Override
-public void loadMetadata(Object source ) throws Exception {
-load( null, source, null );
-}
-
 /** Register a bean by creating a modeler mbean and adding it to the
  * MBeanServer.
  *

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java?rev=1222809&r1=1222808&r2=1222809&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java Fri Dec 
23 19:28:58 2011
@@ -40,24 +40,6 @@ import javax.management.ObjectName;
  */
 public interface RegistryMBean {
 
-/**
- * Load an extended mlet file. The source can be an URL, File or
- * InputStream.
- *
- * All mbeans will be instantiated, registered and the attributes will be
- * set. The result is a list of ObjectNames.
- *
- * @param source InputStream or URL of the file
- * @param cl ClassLoader to be used to load the mbeans, or null to use the
- *default JMX mechanism ( i.e. all registered loaders )
- * @return L

Re: svn commit: r1222809 - in /tomcat/trunk/java/org/apache: catalina/ha/jmx/ClusterJmxHelper.java tomcat/util/modeler/Registry.java tomcat/util/modeler/RegistryMBean.java

[Mark Thomas]

On 23/12/2011 19:28, ma...@apache.org wrote:
> Author: markt
> Date: Fri Dec 23 19:28:58 2011
> New Revision: 1222809
> 
> URL: http://svn.apache.org/viewvc?rev=1222809&view=rev
> Log:
> More unused code removal.
> A little refactoring to allow some methods to be removed to simplify
> later refactoring

My ultimate aim here is to get to the point where we just load
MbeansDescriptorsDigesterSource directly, remove the other classes from
the modules package and possibly move MbeansDescriptorsDigesterSource
into the modeler package and drop the modules package all together.

However, I'm going to redirect my attention to the bug list for next few
days.

Mark

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

svn commit: r1222830 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/catalina/ant/ java/org/apache/catalina/util/ tomcat-catalina-ant/src/ tomcat-catalina-ant/src/main/ tomcat-catalina-ant/src/m

[olamy]

Author: olamy
Date: Fri Dec 23 20:23:42 2011
New Revision: 1222830

URL: http://svn.apache.org/viewvc?rev=1222830&view=rev
Log:
 move classes to  tomcat-catalina-an module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/ant/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/ant/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/util/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/util/Base64.java
  - copied unchanged from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/util/Base64.java
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/ant/
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/util/Base64.java


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

svn commit: r1222831 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/catalina/mbeans/ tomcat-catalina-jmx-remote/src/ tomcat-catalina-jmx-remote/src/main/ tomcat-catalina-jmx-remote/src/main/jav

[olamy]

Author: olamy
Date: Fri Dec 23 20:25:40 2011
New Revision: 1222831

URL: http://svn.apache.org/viewvc?rev=1222831&view=rev
Log:
 move classes to  tomcat-catalina-jmx-remote

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/org/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/org/apache/catalina/mbeans/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/src/main/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
  - copied unchanged from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Removed:

tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java


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

svn commit: r1222832 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/catalina/tribes/ tomcat-tribes/src/ tomcat-tribes/src/main/ tomcat-tribes/src/main/java/ tomcat-tribes/src/main/java/org/ tom

[olamy]

Author: olamy
Date: Fri Dec 23 20:31:52 2011
New Revision: 1222832

URL: http://svn.apache.org/viewvc?rev=1222832&view=rev
Log:
move classes to tomcat-tribes module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/java/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-tribes/src/main/java/org/apache/catalina/tribes/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/tribes/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/tribes/


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

svn commit: r1222837 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/catalina/ java/org/apache/coyote/ java/org/apache/tomcat/jni/ java/org/apache/tomcat/util/ tomcat-catalina-ant/src/main/java/

[olamy]

Author: olamy
Date: Fri Dec 23 20:48:18 2011
New Revision: 1222837

URL: http://svn.apache.org/viewvc?rev=1222837&view=rev
Log:
move classes to tomcat-coyote and tomcat-catalina-module

Added:

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/Base64.java
  - copied unchanged from r1222830, 
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/util/Base64.java
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/coyote/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/coyote/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/jni/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/jni/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/util/
  - copied from r1222751, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/catalina/
tomcat/sandbox/trunk-mvn-build/java/org/apache/coyote/
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/jni/
tomcat/sandbox/trunk-mvn-build/java/org/apache/tomcat/util/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/src/main/java/org/apache/catalina/util/Base64.java

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/ant/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/ha/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/tribes/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/util/file/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/util/res/

tomcat/sandbox/trunk-mvn-build/tomcat-coyote/src/main/java/org/apache/tomcat/util/scan/


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

Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/ tomc

[Olivier Lamy]

2011/12/23 Mark Thomas :
> On 23/12/2011 16:10, ol...@apache.org wrote:
>> Author: olamy
>> Date: Fri Dec 23 16:10:56 2011
>> New Revision: 1222717
>>
>> URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
>> Log:
>> start adding maven poms and modules structure
>
> One thing that does come to mind is that this is a lot of work being
> done that might come to nothing.
If I have fun I can do non useful work :-) sure not too long time.
BTW I know it's possible to have a maven build for tomcat.
I will finish importing current stuff I have done in the github fork
and provide a working build in the sandbox branch.
After it's more a decision from the tomcat community (I still wonder
what a community is: only dev folks, users , possible new contributors
etc... maybe all of that).
So as I cannot be really objective in such discussion/decision :-).
I will let other decide. (I just wanted to prove it can be done
relatively easily)

> Of course, you are free to scratch your
> own itch but I wondered if you thought about looking at the current ant
> file Tomcat uses to create the Maven artifacts and seeing if there was
> some room for improvement. Clearly, there hasn't been much Maven
> expertise around here until recently and improving the current process
> may end up being more productive. For example, a fix for [1] that used
> the current build process would be very helpful.

Not sure this has any link with the current maven metadata provided by
the current ant build.
The ant build can certainly provide all MANIFEST files to include
needed osgi metadatas.
It's just something to do manually. At least the maven plugin provided
by the felix project verify a bit manually writen osgi metadata.

>
> Mark
>
> [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52381
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Olivier

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

svn commit: r1222841 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/el/ tomcat-jasper-el/src/ tomcat-jasper-el/src/main/ tomcat-jasper-el/src/main/java/ tomcat-jasper-el/src/main/java/org/ tomc

[olamy]

Author: olamy
Date: Fri Dec 23 20:56:49 2011
New Revision: 1222841

URL: http://svn.apache.org/viewvc?rev=1222841&view=rev
Log:
move classes to tomcat-jasper-el module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/main/java/org/apache/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/src/main/java/org/apache/el/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/java/org/apache/el/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/el/


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

DO NOT REPLY [Bug 52353] Possibility of unsynchronized concurrent access to field "org.apache.catalina.tribes.group.ChannelInterceptorBase.next"

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52353

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2011-12-23 20:57:31 UTC ---
The second call path quoted is test code that isn't shipped in a Tomcat release
build.

Also, interceptors (and the cluster generally) are not intended to be
configured on the fly. If they were, there is a heap of concurrency issues that
would need to be fixed. Note: on the fly addition and removal of cluster
members is handled.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222844 - in /tomcat/sandbox/trunk-mvn-build: java/org/apache/jasper/ tomcat-jasper/src/ tomcat-jasper/src/main/ tomcat-jasper/src/main/java/ tomcat-jasper/src/main/java/org/ tomcat-jaspe

[olamy]

Author: olamy
Date: Fri Dec 23 20:58:44 2011
New Revision: 1222844

URL: http://svn.apache.org/viewvc?rev=1222844&view=rev
Log:
 move classes to tomcat-jasper module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/main/java/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/main/java/org/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/main/java/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-jasper/src/main/java/org/apache/jasper/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/java/org/apache/jasper/
Removed:
tomcat/sandbox/trunk-mvn-build/java/org/apache/jasper/


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

Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/ tomc

[Mark Thomas]

On 23/12/2011 20:53, Olivier Lamy wrote:
> 2011/12/23 Mark Thomas :
>> On 23/12/2011 16:10, ol...@apache.org wrote:
>>> Author: olamy
>>> Date: Fri Dec 23 16:10:56 2011
>>> New Revision: 1222717
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
>>> Log:
>>> start adding maven poms and modules structure
>>
>> One thing that does come to mind is that this is a lot of work being
>> done that might come to nothing.
> If I have fun I can do non useful work :-) sure not too long time.
> BTW I know it's possible to have a maven build for tomcat.
> I will finish importing current stuff I have done in the github fork
> and provide a working build in the sandbox branch.
> After it's more a decision from the tomcat community (I still wonder
> what a community is: only dev folks, users , possible new contributors
> etc... maybe all of that).
> So as I cannot be really objective in such discussion/decision :-).
> I will let other decide. (I just wanted to prove it can be done
> relatively easily)

Fair enough. It just looks like a lot of work to me but it will be very
useful to be able to compare the two builds side by side.

>> Of course, you are free to scratch your
>> own itch but I wondered if you thought about looking at the current ant
>> file Tomcat uses to create the Maven artifacts and seeing if there was
>> some room for improvement. Clearly, there hasn't been much Maven
>> expertise around here until recently and improving the current process
>> may end up being more productive. For example, a fix for [1] that used
>> the current build process would be very helpful.
> 
> Not sure this has any link with the current maven metadata provided by
> the current ant build.
> The ant build can certainly provide all MANIFEST files to include
> needed osgi metadatas.
> It's just something to do manually. At least the maven plugin provided
> by the felix project verify a bit manually writen osgi metadata.

If we switched to a Maven build would we still need to write this
manually or would that plug-in write it for us?

Mark

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

DO NOT REPLY [Bug 52354] Protect concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.inRemove"

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52354

--- Comment #1 from Mark Thomas  2011-12-23 21:06:21 UTC ---
There is a concurrency issue but not the one described here. Access to that
field is protected by an exclusive lock. It does however need to be volatile.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52355] Synchronize possible concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.checkLock".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52355

--- Comment #1 from Mark Thomas  2011-12-23 21:09:23 UTC ---
That is all essentially debug code. The setter may be accessed via reflection
when server.xml is parsed by I haven't checked if it is exposed. I suspect that
it is not exposed and that it is just changed in the source when debugging
issues.

I'm not concerned about concurrent access but to be on the safe side it should
probably be volatile. The flags it then uses to track status during debugging
should be certainly be volatile.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222850 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

[markt]

Author: markt
Date: Fri Dec 23 21:11:04 2011
New Revision: 1222850

URL: http://svn.apache.org/viewvc?rev=1222850&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52213
enabled should be volatile

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1222850&r1=1222849&r2=1222850&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
Fri Dec 23 21:11:04 2011
@@ -87,7 +87,7 @@ public class FastQueue {
 /**
  * enabled the queue
  */
-private boolean enabled = true;
+private volatile boolean enabled = true;
 
 /**
  *  max queue size
@@ -158,7 +158,7 @@ public class FastQueue {
 
 public void setEnabled(boolean enable) {
 enabled = enable;
-if (!enabled) {
+if (!enable) {
 lock.abortRemove();
 last = first = null;
 }



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

svn commit: r1222852 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

[markt]

Author: markt
Date: Fri Dec 23 21:11:49 2011
New Revision: 1222852

URL: http://svn.apache.org/viewvc?rev=1222852&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52354
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52355
Make debug flags volatile as they are accessed by multiple threads

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1222852&r1=1222851&r2=1222852&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
Fri Dec 23 21:11:49 2011
@@ -59,14 +59,12 @@ public class FastQueue {
 /**
  * check lock to detect strange threadings things
  */
-private boolean checkLock = false;
+private volatile boolean checkLock = false;
 
-
-private boolean inAdd = false;
-
-private boolean inRemove = false;
-
-private boolean inMutex = false;
+// Flags used to detect unexpected state
+private volatile boolean inAdd = false;
+private volatile boolean inRemove = false;
+private volatile boolean inMutex = false;
 
 /**
  * limit the queue length ( default is unlimited)



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

svn commit: r1222854 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Dec 23 21:16:14 2011
New Revision: 1222854

URL: http://svn.apache.org/viewvc?rev=1222854&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52213
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52354
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52355
Make enabled and debug flags volatile as they are accessed by multiple threads

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

DO NOT REPLY [Bug 52213] Field "org.apache.catalina.tribes.transport.bio.util.FastQueue.enabled" should be volatile.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52213

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2011-12-23 21:16:31 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52355] Synchronize possible concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.checkLock".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52355

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-12-23 21:16:57 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52354] Protect concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.inRemove"

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52354

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-12-23 21:17:24 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52356] Prevent potential data races on "org.apache.catalina.tribes.transport.bio.util.FastQueue.size".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52356

--- Comment #1 from Mark Thomas  2011-12-23 21:20:11 UTC ---
Write access is protected by the lock. Making it volatile will ensure the
latest version is available to the getSize() method.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222855 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

[markt]

Author: markt
Date: Fri Dec 23 21:20:46 2011
New Revision: 1222855

URL: http://svn.apache.org/viewvc?rev=1222855&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52356
size needs to be volatile

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1222855&r1=1222854&r2=1222855&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java 
Fri Dec 23 21:20:46 2011
@@ -54,7 +54,7 @@ public class FastQueue {
 /**
  * Current Queue elements size
  */
-private int size = 0;
+private volatile int size = 0;
 
 /**
  * check lock to detect strange threadings things



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

svn commit: r1222856 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Dec 23 21:21:31 2011
New Revision: 1222856

URL: http://svn.apache.org/viewvc?rev=1222856&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52356
size also needs to be volatile

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

DO NOT REPLY [Bug 52356] Prevent potential data races on "org.apache.catalina.tribes.transport.bio.util.FastQueue.size".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52356

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-12-23 21:21:50 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/ tomc

[Olivier Lamy]

2011/12/23 Mark Thomas :
> On 23/12/2011 20:53, Olivier Lamy wrote:
>> 2011/12/23 Mark Thomas :
>>> On 23/12/2011 16:10, ol...@apache.org wrote:
 Author: olamy
 Date: Fri Dec 23 16:10:56 2011
 New Revision: 1222717

 URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
 Log:
 start adding maven poms and modules structure
>>>
>>> One thing that does come to mind is that this is a lot of work being
>>> done that might come to nothing.
>> If I have fun I can do non useful work :-) sure not too long time.
>> BTW I know it's possible to have a maven build for tomcat.
>> I will finish importing current stuff I have done in the github fork
>> and provide a working build in the sandbox branch.
>> After it's more a decision from the tomcat community (I still wonder
>> what a community is: only dev folks, users , possible new contributors
>> etc... maybe all of that).
>> So as I cannot be really objective in such discussion/decision :-).
>> I will let other decide. (I just wanted to prove it can be done
>> relatively easily)
>
> Fair enough. It just looks like a lot of work to me but it will be very
> useful to be able to compare the two builds side by side.
As I'm not a windauze user, I will have some issues to test the
windauze dist :-)
>
>>> Of course, you are free to scratch your
>>> own itch but I wondered if you thought about looking at the current ant
>>> file Tomcat uses to create the Maven artifacts and seeing if there was
>>> some room for improvement. Clearly, there hasn't been much Maven
>>> expertise around here until recently and improving the current process
>>> may end up being more productive. For example, a fix for [1] that used
>>> the current build process would be very helpful.
>>
>> Not sure this has any link with the current maven metadata provided by
>> the current ant build.
>> The ant build can certainly provide all MANIFEST files to include
>> needed osgi metadatas.
>> It's just something to do manually. At least the maven plugin provided
>> by the felix project verify a bit manually writen osgi metadata.
>
> If we switched to a Maven build would we still need to write this
> manually or would that plug-in write it for us?

In both cases, there is a manual work to do to declare osgi stuff like
Export-Package or Import-Package etc...

But at least felix maven plugin can verify Export/Import-Package
declarations with some classes analysis in the module and warn or fail
the build if non correct.


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



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

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

DO NOT REPLY [Bug 52234] More documentation of embedding, please?

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52234

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #3 from Mark Thomas  2011-12-23 21:23:00 UTC ---
No patch as of yet.

Marking as an enhancement.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/ tomc

[Mark Thomas]

On 23/12/2011 21:22, Olivier Lamy wrote:
> 2011/12/23 Mark Thomas :

>> Fair enough. It just looks like a lot of work to me but it will be very
>> useful to be able to compare the two builds side by side.
> As I'm not a windauze user, I will have some issues to test the
> windauze dist :-)

That'll be fun then. I never did manage to get the NSIS installer
running via WINE but I believe Remy did so it must be possible...

>> If we switched to a Maven build would we still need to write this
>> manually or would that plug-in write it for us?
> 
> In both cases, there is a manual work to do to declare osgi stuff like
> Export-Package or Import-Package etc...

Yuck. Time to read up on OSGi.

> But at least felix maven plugin can verify Export/Import-Package
> declarations with some classes analysis in the module and warn or fail
> the build if non correct.

Got it. Thanks for the clarification.

Mark

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

DO NOT REPLY [Bug 52381] Please add OSGi metadata

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52381

--- Comment #2 from Mark Thomas  2011-12-23 21:27:07 UTC ---
Not knowing much about OSGI, if you could provide suitable manifests that would
be great. Once we have them, plugging them into the build is relatively simple.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222857 - in /tomcat/sandbox/trunk-mvn-build: test/javax/ test/org/ test/webapp-2.3/ test/webapp-2.4/ test/webapp-2.5/ test/webapp-3.0-fragments/ test/webapp-3.0-servletsecurity/ test/web

[olamy]

Author: olamy
Date: Fri Dec 23 21:34:01 2011
New Revision: 1222857

URL: http://svn.apache.org/viewvc?rev=1222857&view=rev
Log:
move test sources to a tomcat-tests module: could be improve with moving test 
to their own modules

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/javax/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/org/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-2.3/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/webapp-2.3/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-2.4/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/webapp-2.4/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-2.5/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/webapp-2.5/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/test/webapp-3.0/

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0-fragments/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-fragments/

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0-servletsecurity/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-servletsecurity/

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0-servletsecurity2/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-servletsecurity2/

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0-virtual-library/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-virtual-library/

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/resources/webapp-3.0-virtual-webapp/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-virtual-webapp/
Removed:
tomcat/sandbox/trunk-mvn-build/test/javax/
tomcat/sandbox/trunk-mvn-build/test/org/
tomcat/sandbox/trunk-mvn-build/test/webapp-2.3/
tomcat/sandbox/trunk-mvn-build/test/webapp-2.4/
tomcat/sandbox/trunk-mvn-build/test/webapp-2.5/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-fragments/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-servletsecurity/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-servletsecurity2/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-virtual-library/
tomcat/sandbox/trunk-mvn-build/test/webapp-3.0-virtual-webapp/


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

svn commit: r1222860 - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/src/conf/ conf/ tomcat-webapps/docs/src/ tomcat-webapps/docs/src/main/ tomcat-webapps/docs/src/main/docs/ tomcat-webapps/docs/s

[olamy]

Author: olamy
Date: Fri Dec 23 21:45:42 2011
New Revision: 1222860

URL: http://svn.apache.org/viewvc?rev=1222860&view=rev
Log:
move docs webapp to a maven module

Added:
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/conf/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/conf/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/META-INF/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/META-INF/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/WEB-INF/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/WEB-INF/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/aio.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/aio.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/api/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/webapps/docs/api/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/appdev/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/appdev/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/apr.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/apr.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/architecture/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/architecture/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/balancer-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/balancer-howto.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/building.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/building.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/cgi-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/cgi-howto.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/changelog.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/changelog.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/class-loader-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/class-loader-howto.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/cluster-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/cluster-howto.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/config/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/config/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/connectors.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/connectors.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/default-servlet.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/default-servlet.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/deployer-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/deployer-howto.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/developers.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/developers.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/elapi/
  - copied from r1222835, tomcat/sandbox/trunk-mvn-build/webapps/docs/elapi/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/extras.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/extras.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/funcspecs/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/funcspecs/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/html-manager-howto.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/html-manager-howto.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/images/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/images/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/index.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/index.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/introduction.xml
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/docs/introduction.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/src/main/docs/jasper-howto

DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52328

--- Comment #2 from Mark Thomas  2011-12-23 21:48:56 UTC ---
r411577 looks to be the commit the triggered this issue

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222863 - in /tomcat/sandbox/trunk-mvn-build: tomcat-webapps/examples/ tomcat-webapps/examples/src/ tomcat-webapps/examples/src/main/ tomcat-webapps/examples/src/main/java/ tomcat-webapps

[olamy]

Author: olamy
Date: Fri Dec 23 21:53:15 2011
New Revision: 1222863

URL: http://svn.apache.org/viewvc?rev=1222863&view=rev
Log:
move examples webapp to a maven module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/CookieExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/CookieExample.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/HelloWorldExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/HelloWorldExample.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/LocalStrings.properties
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/LocalStrings.properties

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/LocalStrings_en.properties
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/LocalStrings_en.properties

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/LocalStrings_es.properties
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/LocalStrings_es.properties

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/LocalStrings_fr.properties
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/LocalStrings_pt.properties
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/RequestHeaderExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/RequestHeaderExample.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/RequestInfoExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/RequestInfoExample.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/RequestParamExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/RequestParamExample.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/ServletToJsp.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/ServletToJsp.java

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/SessionExample.java
  - copied unchanged from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/async/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/async/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/cal/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/cal/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/chat/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/chat/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/checkbox/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/checkbox/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/colors/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/colors/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/compressionFilters/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/compressionFilters/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/dates/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/dates/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/error/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/error/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/examples/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/examples/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/java/filters/
  - copied from r1222835, 
tomcat/sandbox/trunk-mvn-build/webapps/examples/WEB-INF/classes/filters/
tomcat/sandbox/trunk-mvn-buil

svn commit: r1222871 - in /tomcat/sandbox/trunk-mvn-build/tomcat-webapps: docs/pom.xml examples/pom.xml host-manager/pom.xml manager/pom.xml pom.xml root/pom.xml

[olamy]

Author: olamy
Date: Fri Dec 23 22:19:45 2011
New Revision: 1222871

URL: http://svn.apache.org/viewvc?rev=1222871&view=rev
Log:
change groupId for tomcat-webapps pom

Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml Fri Dec 23 
22:19:45 2011
@@ -21,11 +21,11 @@
   4.0.0
 
   
-org.apache.tomcat
+org.apache.tomcat.webapps
 tomcat-webapps
 7.0.24-SNAPSHOT
   
-  org.apache.tomcat.webapps
+
   docs
   war
 

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml Fri Dec 23 
22:19:45 2011
@@ -21,12 +21,11 @@
   4.0.0
 
   
-org.apache.tomcat
+org.apache.tomcat.webapps
 tomcat-webapps
 7.0.24-SNAPSHOT
   
 
-  org.apache.tomcat.webapps
   examples
   war
 

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml 
(original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml Fri Dec 
23 22:19:45 2011
@@ -21,12 +21,11 @@
   4.0.0
 
   
-org.apache.tomcat
+org.apache.tomcat.webapps
 tomcat-webapps
 7.0.24-SNAPSHOT
   
 
-  org.apache.tomcat.webapps
   host-manager
   war
 

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml Fri Dec 23 
22:19:45 2011
@@ -21,12 +21,11 @@
   4.0.0
 
   
-org.apache.tomcat
+org.apache.tomcat.webapps
 tomcat-webapps
 7.0.24-SNAPSHOT
   
 
-  org.apache.tomcat.webapps
   manager
   war
 

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml Fri Dec 23 22:19:45 
2011
@@ -26,6 +26,7 @@
 7.0.24-SNAPSHOT
   
 
+  org.apache.tomcat.webapps
   tomcat-webapps
   pom
 
@@ -33,7 +34,7 @@
 
 
   
-ROOT
+root
 manager
 host-manager
 examples

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml?rev=1222871&r1=1222870&r2=1222871&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml Fri Dec 23 
22:19:45 2011
@@ -21,11 +21,11 @@
   4.0.0
 
   
-org.apache.tomcat
+org.apache.tomcat.webapps
 tomcat-webapps
 7.0.24-SNAPSHOT
   
-  org.apache.tomcat.webapps
+
   root
   war
 



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

svn commit: r1222873 - in /tomcat/sandbox/trunk-mvn-build: tomcat-webapps/examples/ tomcat-webapps/host-manager/src/ tomcat-webapps/host-manager/src/main/ tomcat-webapps/host-manager/src/main/webapp/

[olamy]

Author: olamy
Date: Fri Dec 23 22:27:34 2011
New Revision: 1222873

URL: http://svn.apache.org/viewvc?rev=1222873&view=rev
Log:
move host-manager webapp to a maven module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/webapp/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/webapp/META-INF/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/META-INF/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/webapp/WEB-INF/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/WEB-INF/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/webapp/images/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/images/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/src/main/webapp/index.jsp
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/index.jsp
Removed:
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/META-INF/
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/WEB-INF/
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/images/
tomcat/sandbox/trunk-mvn-build/webapps/host-manager/index.jsp
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml?rev=1222873&r1=1222872&r2=1222873&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml Fri Dec 23 
22:27:34 2011
@@ -37,7 +37,9 @@
 
   
 src/main/java
-**/*.properties
+
+  **/*.properties
+
   
 
   



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

svn commit: r1222874 - in /tomcat/sandbox/trunk-mvn-build: tomcat-webapps/manager/src/ tomcat-webapps/manager/src/main/ tomcat-webapps/manager/src/main/webapp/ tomcat-webapps/manager/src/main/webapp/M

[olamy]

Author: olamy
Date: Fri Dec 23 22:29:16 2011
New Revision: 1222874

URL: http://svn.apache.org/viewvc?rev=1222874&view=rev
Log:
move manager webapp to a maven module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/META-INF/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/META-INF/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/WEB-INF/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/WEB-INF/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/images/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/images/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/index.jsp
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/index.jsp

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/status.xsd
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/status.xsd

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/src/main/webapp/xform.xsl
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/manager/xform.xsl
Removed:
tomcat/sandbox/trunk-mvn-build/webapps/manager/META-INF/
tomcat/sandbox/trunk-mvn-build/webapps/manager/WEB-INF/
tomcat/sandbox/trunk-mvn-build/webapps/manager/images/
tomcat/sandbox/trunk-mvn-build/webapps/manager/index.jsp
tomcat/sandbox/trunk-mvn-build/webapps/manager/status.xsd
tomcat/sandbox/trunk-mvn-build/webapps/manager/xform.xsl


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

svn commit: r1222876 - in /tomcat/sandbox/trunk-mvn-build: tomcat-webapps/root/src/ tomcat-webapps/root/src/main/ tomcat-webapps/root/src/main/webapp/ tomcat-webapps/root/src/main/webapp/WEB-INF/ weba

[olamy]

Author: olamy
Date: Fri Dec 23 22:33:16 2011
New Revision: 1222876

URL: http://svn.apache.org/viewvc?rev=1222876&view=rev
Log:
move root webapp to a maven module

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/WEB-INF/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/WEB-INF/

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/asf-logo-wide.gif
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/asf-logo-wide.gif

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/asf-logo.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/asf-logo.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/bg-button.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-button.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/bg-middle.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-middle.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/bg-nav-item.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-nav-item.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/bg-nav.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-nav.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/bg-upper.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-upper.png
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/build.xml
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/build.xml

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/favicon.ico
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/favicon.ico
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/index.jsp
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/index.jsp

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/tomcat-power.gif
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat-power.gif

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/tomcat.css
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.css

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/tomcat.gif
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.gif

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/tomcat.png
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.png

tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/src/main/webapp/tomcat.svg
  - copied unchanged from r1222868, 
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.svg
Removed:
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/WEB-INF/
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/asf-logo-wide.gif
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/asf-logo.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-button.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-middle.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-nav-item.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-nav.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/bg-upper.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/build.xml
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/favicon.ico
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/index.jsp
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat-power.gif
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.css
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.gif
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.png
tomcat/sandbox/trunk-mvn-build/webapps/ROOT/tomcat.svg


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

svn commit: r1222878 - in /tomcat/sandbox/trunk-mvn-build: apache-tomcat/src/bin/ bin/

[olamy]

Author: olamy
Date: Fri Dec 23 22:45:59 2011
New Revision: 1222878

URL: http://svn.apache.org/viewvc?rev=1222878&view=rev
Log:
move bin directory to assembly module: unix distro works :-)

Added:
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/bin/
  - copied from r1222868, tomcat/sandbox/trunk-mvn-build/bin/
Removed:
tomcat/sandbox/trunk-mvn-build/bin/


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

svn commit: r1222879 - /tomcat/sandbox/trunk-mvn-build/README.TXT

[olamy]

Author: olamy
Date: Fri Dec 23 22:48:38 2011
New Revision: 1222879

URL: http://svn.apache.org/viewvc?rev=1222879&view=rev
Log:
add a simple README with basic mvn instructions

Added:
tomcat/sandbox/trunk-mvn-build/README.TXT   (with props)

Added: tomcat/sandbox/trunk-mvn-build/README.TXT
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/README.TXT?rev=1222879&view=auto
==
--- tomcat/sandbox/trunk-mvn-build/README.TXT (added)
+++ tomcat/sandbox/trunk-mvn-build/README.TXT Fri Dec 23 22:48:38 2011
@@ -0,0 +1,6 @@
+build distrib with skipping tests
+svn co  https://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build
+cd trunk-mvn-build
+mvn clean install -DskipTests
+cd 
apache-tomcat/target/apache-tomcat-7.0.24-SNAPSHOT-bin/apache-tomcat-7.0.24-SNAPSHOT/bin/
+./startup.sh

Propchange: tomcat/sandbox/trunk-mvn-build/README.TXT
--
svn:eol-style = native

Propchange: tomcat/sandbox/trunk-mvn-build/README.TXT
--
svn:keywords = Author Date Id Revision



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

svn commit: r1222885 - in /tomcat/sandbox/trunk-mvn-build/tomcat-tests: src/test/java/javax/el/ src/test/java/javax/servlet/jsp/ src/test/java/org/apache/catalina/core/ src/test/java/org/apache/catali

[olamy]

Author: olamy
Date: Fri Dec 23 23:19:07 2011
New Revision: 1222885

URL: http://svn.apache.org/viewvc?rev=1222885&view=rev
Log:
fix some paths due to test sources move

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/WEB-INF/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/webapps/examples/WEB-INF/lib/
  - copied from r1222868, 
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/src/main/webapp/WEB-INF/lib/
Modified:

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestDefaultInstanceManager.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContext.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardContextResources.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/core/TestStandardWrapper.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualWebappLoader.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestContextConfig.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TomcatBaseTest.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/TestAbstractHttp11Processor.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/el/TestELInJsp.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestCompiler.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestGenerator.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspDocumentParser.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParser.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestScriptingVariabler.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/naming/resources/TestWarDirContext.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/el/TestCompositeELResolver.java
 Fri Dec 23 23:19:07 2011
@@ -35,7 +35,7 @@ public class TestCompositeELResolver ext
 public void testBug50408() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
-File appDir =  new File("test/webapp-3.0");
+File appDir =  new File(getBaseTestResourcesPath()+"/webapp-3.0");
 // app dir is relative to server home
 StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
 "/test", appDir.getAbsolutePath());

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java?rev=1222885&r1=1222884&r2=1222885&view=diff
==
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/javax/servlet/jsp/TestPageContext.java
 Fri Dec 23 23:19:07 2011
@@ -33,7 +33,7 @@ public class TestPageContext extends Tom
 public void testBug49196() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-3.0");
+File appDir = new File(getBaseTestResourcesPath()+"/

svn commit: r1222888 - in /tomcat/sandbox/trunk-mvn-build: pom.xml tomcat-webapps/docs/pom.xml

[olamy]

Author: olamy
Date: Fri Dec 23 23:43:17 2011
New Revision: 1222888

URL: http://svn.apache.org/viewvc?rev=1222888&view=rev
Log:
version and build-date parameters passed to xsl transformation

Modified:
tomcat/sandbox/trunk-mvn-build/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/pom.xml?rev=1222888&r1=1222887&r2=1222888&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/pom.xml Fri Dec 23 23:43:17 2011
@@ -135,6 +135,12 @@
   true
 
 
+
+  org.codehaus.mojo
+  buildnumber-maven-plugin
+  1.0
+
+
   
 
   

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml?rev=1222888&r1=1222887&r2=1222888&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml Fri Dec 23 
23:43:17 2011
@@ -49,6 +49,26 @@
   
   
 org.codehaus.mojo
+buildnumber-maven-plugin
+
+  
+validate
+
+  create
+
+  
+
+
+  false
+  false
+  {0,date,MMM d }
+  
+timestamp
+  
+
+  
+  
+org.codehaus.mojo
 xml-maven-plugin
 1.0
 
@@ -76,6 +96,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
 
   src/main/docs/appdev
@@ -92,6 +122,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
 
   src/main/docs/funcspecs
@@ -108,6 +148,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
 
   src/main/docs/config
@@ -124,6 +174,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
 
   src/main/docs/architecture
@@ -140,6 +200,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
 
   src/main/docs/tribes
@@ -156,6 +226,16 @@
   .html
 
   
+  
+
+  version
+  ${project.version}
+
+
+  build-date
+  ${buildNumber}
+
+  
 
   
 



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

svn commit: r1222891 - in /tomcat/sandbox/trunk-mvn-build/tomcat-catalina: ./ src/main/java/org/apache/catalina/util/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/mai

[olamy]

Author: olamy
Date: Sat Dec 24 00:00:54 2011
New Revision: 1222891

URL: http://svn.apache.org/viewvc?rev=1222891&view=rev
Log:
add filtering on ServerInfo.properties

Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
  - copied, changed from r1222868, 
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
Removed:

tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml?rev=1222891&r1=1222890&r2=1222891&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml Sat Dec 24 00:00:54 
2011
@@ -77,6 +77,7 @@
 
   
 src/main/resources
+true
   
   
 src/main/java
@@ -86,6 +87,28 @@
 
   
 
+
+  
+org.codehaus.mojo
+buildnumber-maven-plugin
+
+  
+validate
+
+  create
+
+  
+
+
+  false
+  false
+  {0,date,MMM d  hh:mm:ss}
+  
+timestamp
+  
+
+  
+
   
 
   

svn commit: r1222892 - in /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler: TestJspConfig.java TestValidator.java

[olamy]

Author: olamy
Date: Sat Dec 24 00:04:22 2011
New Revision: 1222892

URL: http://svn.apache.org/viewvc?rev=1222892&view=rev
Log:
fix test resources path

Modified:

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java

tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java?rev=1222892&r1=1222891&r2=1222892&view=diff
==
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestJspConfig.java
 Sat Dec 24 00:04:22 2011
@@ -34,7 +34,7 @@ public class TestJspConfig extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.3");
+new File(getBaseTestResourcesPath()+"/webapp-2.3");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -54,7 +54,7 @@ public class TestJspConfig extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.4");
+new File(getBaseTestResourcesPath()+"/webapp-2.4");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -74,7 +74,7 @@ public class TestJspConfig extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.5");
+new File(getBaseTestResourcesPath()+"/webapp-2.5");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java?rev=1222892&r1=1222891&r2=1222892&view=diff
==
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/jasper/compiler/TestValidator.java
 Sat Dec 24 00:04:22 2011
@@ -57,7 +57,7 @@ public class TestValidator extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.3");
+new File(getBaseTestResourcesPath()+"/webapp-2.3");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -82,7 +82,7 @@ public class TestValidator extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.4");
+new File(getBaseTestResourcesPath()+"/webapp-2.4");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -107,7 +107,7 @@ public class TestValidator extends Tomca
 Tomcat tomcat = getTomcatInstance();
 
 File appDir =
-new File("test/webapp-2.5");
+new File(getBaseTestResourcesPath()+"/webapp-2.5");
 // app dir is relative to server home
 tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 



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

DO NOT REPLY [Bug 52356] Prevent potential data races on "org.apache.catalina.tribes.transport.bio.util.FastQueue.size".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52356

--- Comment #3 from Mohsen Vakilian  2011-12-24 
00:08:34 UTC ---
Thanks for resolving this issue. Keshmesh 
detected this problem when we ran it on Tomcat using method
"org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.run()"
as an entry point.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52355] Synchronize possible concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.checkLock".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52355

--- Comment #3 from Mohsen Vakilian  2011-12-24 
00:09:18 UTC ---
Thanks for resolving this issue. Keshmesh 
detected this problem when we ran it on Tomcat using method
"org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.run()"
as an entry point.

(In reply to comment #2)
> Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52354] Protect concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.inRemove"

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52354

--- Comment #3 from Mohsen Vakilian  2011-12-24 
00:10:25 UTC ---
Thanks for resolving the visibility issue. Keshmesh
 detected this problem when we ran it on
Tomcat using method
"org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.run()"
as an entry point.

(In reply to comment #2)
> Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1222893 - /tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml

[olamy]

Author: olamy
Date: Sat Dec 24 00:13:42 2011
New Revision: 1222893

URL: http://svn.apache.org/viewvc?rev=1222893&view=rev
Log:
don't use same id for goal execution

Modified:
tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml?rev=1222893&r1=1222892&r2=1222893&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml Sat Dec 24 00:13:42 
2011
@@ -188,6 +188,7 @@
   
 
   
+
 
   commons-daemons-native-download
   
@@ -205,7 +206,7 @@
 
 
   
-http-download-single
+download-commons-daemons-native-download
 prepare-package
 
   download-single
@@ -238,7 +239,7 @@
 
 
   
-http-download-single
+download-tomcat-native-download
 prepare-package
 
   download-single



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

DO NOT REPLY [Bug 52353] Possibility of unsynchronized concurrent access to field "org.apache.catalina.tribes.group.ChannelInterceptorBase.next"

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52353

--- Comment #2 from Mohsen Vakilian  2011-12-24 
00:21:24 UTC ---
Thanks for reviewing this issue. Keshmesh 
detected this problem when we marked method
"org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor.run()"
as an entry point and ran Keshmesh on Tomcat.

Keshmesh considers the method "Runnable.run()" as an indicator of possible
concurrency. Of course, "Runnable.run()" may not be ever used in a concurrent
context, as seems to be the case here.

It's good to know that interceptors are not supposed to be configured on the
fly. We'd be happy to run Keshmesh on other concurrent parts of Tomcat.
Keshmesh analyzes the code that is reachable from the methods that we mark as
entry points. Given your deep knowledge of the Tomcat code base, you know
better which part of Tomcat is more likely to benefit from Keshmesh. Do you
know of other concurrent parts of Tomcat that might benefit from Keshmesh
analyses more?

By the way, if you use Eclipse, you can try out Keshmesh yourself. We'd love to
hear your feedback on it.

(In reply to comment #1)
> Also, interceptors (and the cluster generally) are not intended to be
> configured on the fly. If they were, there is a heap of concurrency issues 
> that
> would need to be fixed. Note: on the fly addition and removal of cluster
> members is handled.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52355] Synchronize possible concurrent accesses to field "org.apache.catalina.tribes.transport.bio.util.FastQueue.checkLock".

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52355

--- Comment #4 from Rainer Jung  2011-12-24 00:24:29 
UTC ---
When I wrote that queue at the end of 2004 using some hand made asymmetric
locks I added the checkLock flag to be able to debug in case the lock
constructs would turn out to be buggy.

Now, 7 years later, ans after only very few changes to that code, I think we
actually no longer need "checkLock" and the flags only neded in combination
with checkLock, i.e. inAdd, inRemove, inMutex.

IMHO we can remove that part.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test :  Tomcat 7.x, a web server implementing Java Servlet 
3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 mins 46 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-24122011.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24122011-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24122011-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24122011.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/worksp
 ace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-24122011.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
 
0.x/tomcat-deps/tomcat-dbcp-24122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24122011.jar:/srv/gump/public/worksp

[Tomcat Wiki] Trivial Update of "PoweredBy" by babayaga

[Apache Wiki]

Dear Wiki user,

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

The "PoweredBy" page has been changed by babayaga:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=393&rev2=394

  === Homegevity ===
  {{http://www.homegevity.com/image/homegevity-logo.jpg}} 
[[http://www.homegevity.com/|Homegevity]] is a National 
[[http://www.homegevity.com/real_estate.php|Real Estate]] and 
[[http://www.homegevity.com/rental_units.php|Rental]] site. The site runs a 
complex property database system using Tomcat.
  
+ === Hotels & Accommodation ===
+ {{http://www.hotelsandaccommodation.com.au/hotels.png}} 
[[http://www.hotelsandaccommodation.com.au/|Hotels and Accommodation]] is an 
[[http://www.hotelsandaccommodation.com.au/australia/|Australian]] 
[[http://www.hotelsandaccommodation.com.au/victoria/hepburn-springs/|accommodation]]
 site. The website utilizes a hotel database system using Tomcat.
+ 
  === HubSpot ===
  {{http://www.hubspot.com/Portals/53/images/website_logo.gif}} 
[[http://dev.hubspot.com/|HubSpot]] is an inbound marketing system to help your 
small or medium sized business get found on the Internet by the right prospects 
and convert more of them into leads and customers for maximum marketing ROI.
  

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

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

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 4 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test :  Tomcat 8.x, a web server implementing Java Servlet 
3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 mins 33 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-24122011.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24122011-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24122011-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24122011.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/worksp
 ace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-24122011.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr
 
unk/tomcat-deps/tomcat-dbcp-24122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24122011.jar:/srv/gump/public/workspace/junit/dist/j