Re: AW: AW: Bug 51334 - Federation support for Tomcat
Hello, Even if it's a good addition, I understand the fact about not integrate this in the standard Apache Tomcat distribution (option 1) to prevent having too huge distribution with some new external dependencies. 2011/10/19 Oliver Wulff : > I get the impression, rightly or wrongly, that this is an attempt to to get a > jump > start for a little used SSO solution by getting it included in the > Tomcat build. That isn't the way the ASF works. > This is not the case. It's the other way around. The federation plugin should > help Tomcat to better compete with the big closed source solutions by > supporting an industry standard. In constrast to buy and integrate a security > product where you have to deploy custom agents to all sort of containers to > be able to integrate with the centrally running security component (usually > the communication between the agents and the central security component is > proprietary). > > What would be the next steps to go with Apache Extras? Here we/I can help you for project creation etc... I just wonder about the package names to use and maven coordinate. Not sure if Apache extras stuff can use org.apache.* namespace especially for maven deployment in this groupId org.apache.* . (org.apache.extras.* ?) What can we use ? org.talend.tomcat.extras ? > > This is not my decision, it is the community's decision. I am just one > voice in that community with a tendency to state an opinion given the > opportunity. You need to convince the community that this is worth > doing. Actually, that isn't strictly true. Since this is a code change > any committer could veto it. I'd suggest leaving it a few days to see if > any of the other committers comment. > +1 > > Thanks > Oliver > > Von: Mark Thomas [ma...@apache.org] > Gesendet: Mittwoch, 19. Oktober 2011 16:41 > Bis: Tomcat Developers List > Betreff: Re: AW: AW: Bug 51334 - Federation support for Tomcat > > On 19/10/2011 15:16, Oliver Wulff wrote: >> Hi Mark >> > >> The lack of demand argument applies equally to WS-Federation >> considered in isolation. I'd like to see that there was at least some >> traction behind this in the Tomcat community before going with option >> 2. >> >> I understand where you're coming from. >> >> IMHO, the federation functionality gives a lot of added value to >> tomcat for being able to support single sign across within an >> enterprise as well as across enterprises or in the cloud. Thus tomcat >> can even better compete with big application servers because you get >> enterprise SSO only by also using the identity suite. > > There are plenty of other SSO options out there that ship with the > necessary modules for Tomcat. That, combined with the minimal interest > in WS-Federation seen in the community to date, makes me think that a > separate project is the right place for this. It is a model that has > worked well for many SSO solutions for a number of years. > > There have been preliminary discussions about merging SecurityFilter > into the Tomcat code base as it is so widely used but that discussion > died down without anything happening. And I am fine with that. > > Personally I think something needs to be as widely used as > SecurityFilter before we even think about adding it to the Tomcat code > base. The Tuckey UrlRewriteFilter is another component that gets used > often enough that I'd be happy to see it added to the code base. I'll > add at this point I am just using these as examples. I am *not* > suggesting that these projects to be borged by the Tomcat project. If > they choose to approach us, I am sure we'd listen carefully to their > proposals. > >> Very often, big enterprises uses Microsoft Active Directory (which >> includes the federation IDP (ADFS)) to authenticate their users which >> includes ADFS. The federation plugin can integrate with ADFS >> out-of-the-box - not yet tested. Thus, you get SSO within your >> enterprise without deploying another identity suite with your tomcat >> based applications. > > If the enterprise is using Microsoft AD then Tomcat can plug directly > into that via the built-in Kerberos support. See [1]. The addition of > that feature had the right balance of user demand and minimal code > additions / changes to Tomcat. > >> Therefore, I think we can get better confidence from potential >> customers if the federation plugin is provided as part of Tomcat >> extras module. > > That is not a sufficient reason to add it to the build. I get the > impression, rightly or wrongly, that this is an attempt to to get a jump > start for a little used SSO solution by getting it included in the > Tomcat build. That isn't the way the ASF works. > > Every feature added to Tomcat is considered (informally) in terms of: > - user demand > - additional code added > - changes that might break other stuff > - ease of maintenance > > When I measure WS-Federation against these criteria it does not reach
svn commit: r1187197 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Oct 21 07:59:38 2011 New Revision: 1187197 URL: http://svn.apache.org/viewvc?rev=1187197&view=rev Log: Update vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1187197&r1=1187196&r2=1187197&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 21 07:59:38 2011 @@ -77,8 +77,7 @@ PATCHES PROPOSED TO BACKPORT: In BackupManager, change of session ID is replicated by the call of a setId() method. http://svn.apache.org/viewvc?view=revision&revision=1186632 http://svn.apache.org/viewvc?view=revision&revision=1187152 - +1: kfujino - +0: markt (see http://markmail.org/message/otohu2w3o5v7l732) + +1: kfujino, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187229 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 21 09:14:11 2011 New Revision: 1187229 URL: http://svn.apache.org/viewvc?rev=1187229&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1187229&r1=1187228&r2=1187229&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 21 09:14:11 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: In BackupManager, change of session ID is replicated by the call of a setId() method. http://svn.apache.org/viewvc?view=revision&revision=1186632 http://svn.apache.org/viewvc?view=revision&revision=1187152 - +1: kfujino, markt + +1: kfujino, markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187230 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tom
Author: olamy Date: Fri Oct 21 09:15:03 2011 New Revision: 1187230 URL: http://svn.apache.org/viewvc?rev=1187230&view=rev Log: [MTOMCAT-77] Add support for using the test classpath instead of the compile classpath with tomcat:run. Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java?rev=1187230&r1=1187229&r2=1187230&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java Fri Oct 21 09:15:03 2011 @@ -38,6 +38,8 @@ public class ClassLoaderEntriesCalculato private boolean addWarDependenciesInClassloader; +private boolean useTestClassPath; + public MavenProject getMavenProject() { return mavenProject; @@ -82,4 +84,15 @@ public class ClassLoaderEntriesCalculato this.addWarDependenciesInClassloader = addWarDependenciesInClassloader; return this; } + +public boolean isUseTestClassPath() +{ +return useTestClassPath; +} + +public ClassLoaderEntriesCalculatorRequest setUseTestClassPath( boolean useTestClassPath ) +{ +this.useTestClassPath = useTestClassPath; +return this; +} } Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187230&r1=1187229&r2=1187230&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Fri Oct 21 09:15:03 2011 @@ -61,8 +61,9 @@ public class DefaultClassLoaderEntriesCa try { -@SuppressWarnings( "unchecked" ) List classPathElements = -request.getMavenProject().getCompileClasspathElements(); +@SuppressWarnings( "unchecked" ) List classPathElements = request.isUseTestClassPath() +? request.getMavenProject().getTestClasspathElements() +: request.getMavenProject().getCompileClasspathElements(); if ( classPathElements != null ) { for ( String classPathElement : classPathElements ) @@ -90,7 +91,8 @@ public class DefaultClassLoaderEntriesCa String scope = artifact.getScope(); // skip provided and test scoped artifacts -if ( !Artifact.SCOPE_PROVIDED.equals( scope ) && !Artifact.SCOPE_TEST.equals( scope ) ) +if ( !Artifact.SCOPE_PROVIDED.equals( scope ) && ( !Artifact.SCOPE_TEST.equals( scope ) +|| request.isUseTestClassPath() ) ) { request.getLog().debug( "add dependency to webapploader " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1187230&r1=1187229&r2=1187230&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java Fri Oct 21 09:15:03 2011 @@ -49,7 +49,7 @@ import java.util.Set;
svn commit: r1187231 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/
Author: olamy Date: Fri Oct 21 09:15:22 2011 New Revision: 1187231 URL: http://svn.apache.org/viewvc?rev=1187231&view=rev Log: [MTOMCAT-95] Add directories to the embedded tomcat classloader (equivalent to shared.loader property in regular tomcat instance). Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1187231&r1=1187230&r2=1187231&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java Fri Oct 21 09:15:22 2011 @@ -116,6 +116,14 @@ public class RunMojo */ private boolean useTestClasspath; +/** + * Additional optional directories to add to the embedded tomcat classpath. + * + * @parameter alias = "additionalClassesDirs" + * @since 2.0 + */ +private List additionalClasspathDirs; + private File temporaryContextFile = null; // -- @@ -168,6 +176,16 @@ public class RunMojo loader.addRepository( classLoaderEntry ); } } +if ( additionalClasspathDirs != null && !additionalClasspathDirs.isEmpty() ) +{ +for ( File additionalClasspathDir : additionalClasspathDirs ) +{ +if ( additionalClasspathDir.exists() ) +{ +loader.addRepository( additionalClasspathDir.toURI().toString() ); +} +} +} } catch ( TomcatRunException e ) { Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1187231&r1=1187230&r2=1187231&view=diff == --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java Fri Oct 21 09:15:22 2011 @@ -112,6 +112,14 @@ public class RunMojo */ private boolean useTestClasspath; +/** + * Additional optional directories to add to the embedded tomcat classpath. + * + * @parameter alias = "additionalClassesDirs" + * @since 2.0 + */ +private List additionalClasspathDirs; + private File temporaryContextFile = null; /** @@ -228,6 +236,17 @@ public class RunMojo loader.addRepository( classLoaderEntry ); } } + +if ( additionalClasspathDirs != null && !additionalClasspathDirs.isEmpty() ) +{ +for ( File additionalClasspathDir : additionalClasspathDirs ) +{ +if ( additionalClasspathDir.exists() ) +{ +loader.addRepository( additionalClasspathDir.toURI().toString() ); +} +} +} } catch ( TomcatRunException e ) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy Date: Fri Oct 21 09:15:37 2011 New Revision: 1187232 URL: http://svn.apache.org/viewvc?rev=1187232&view=rev Log: prefer Set to prevent duplicate entries Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187232&r1=1187231&r2=1187232&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Fri Oct 21 09:15:37 2011 @@ -38,7 +38,9 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * @author Olivier Lamy @@ -56,7 +58,8 @@ public class DefaultClassLoaderEntriesCa public List calculateClassPathEntries( ClassLoaderEntriesCalculatorRequest request ) throws TomcatRunException { -List classLoaderEntries = new ArrayList(); +Set classLoaderEntries = new HashSet(); +//List classLoaderEntries = new ArrayList( ); // add classes directories to loader try @@ -158,7 +161,8 @@ public class DefaultClassLoaderEntriesCa } } } -return classLoaderEntries; +return new ArrayList( classLoaderEntries ); +//return classLoaderEntries; } private void deleteDirectory( File directory, Log log ) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-95) Add directories to the embedded tomcat classloader (equivalent to shared.loader property in regular tomcat instance).
[ https://issues.apache.org/jira/browse/MTOMCAT-95?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-95. --- Resolution: Fixed > Add directories to the embedded tomcat classloader (equivalent to > shared.loader property in regular tomcat instance). > - > > Key: MTOMCAT-95 > URL: https://issues.apache.org/jira/browse/MTOMCAT-95 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 1.1 >Reporter: Nick Lloyd >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > Attachments: additionalClasspathDirs.patch > > > For one of my projects I needed to add directories to the classpath of a > tomcat instance. I added additional functionality to tomcat-maven-plugin > v1.1 to support this by adding configured directories to the Embedded tomcat > classloader (only tomcat:run mojo affected). Attached is the patch file of > my modifications. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-77) Add support for using the test classpath instead of the compile classpath with tomcat:run
[ https://issues.apache.org/jira/browse/MTOMCAT-77?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-77. --- Resolution: Fixed > Add support for using the test classpath instead of the compile classpath > with tomcat:run > - > > Key: MTOMCAT-77 > URL: https://issues.apache.org/jira/browse/MTOMCAT-77 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature >Affects Versions: 1.1 > Environment: Maven >Reporter: Oscar Westra van Holthe - Kind >Assignee: Olivier Lamy > Fix For: 2.0 > > > For an _instant developer experience_, we need to be able to do something > like the following: > {code} > svn co https://company.repository.com/project/foo foo > cd foo > mvn install > mvn tomcat:run > {code} > Using the tomcat:run goal in itself works perfectly, but the (in-memory) > database is empty. Using the Jetty plugin, I can choose to use the test > classpath (which tells Hibernate to initialize the database): > {code:xml} > > org.mortbay.jetty > maven-jetty-plugin > 6.1.26 > > true > > /src/test/config/jetty-env.xml > > > > > {code} > I want to do something similar with the Tomcat plugin: > {code:xml} > > org.codehaus.mojo > tomcat-maven-plugin > 1.1 > > true > / > src/test/config/tomcat-context.xml > > > > {code} > So my request is: add a "useTestClasspath" configuration setting for tje > class RunMojo that tells it to use > {{MavenProject.getTestClasspathElements()}} instead of > {{MavenProject.getCompileClasspathElements()}} when creating the webapp > loader. On 2011-02-08, this was line 132 in the class > {{org.codehaus.mojo.tomcat.RunMojo}}. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187233 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy Date: Fri Oct 21 09:15:52 2011 New Revision: 1187233 URL: http://svn.apache.org/viewvc?rev=1187233&view=rev Log: cleanup commented code Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187233&r1=1187232&r2=1187233&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Fri Oct 21 09:15:52 2011 @@ -59,9 +59,8 @@ public class DefaultClassLoaderEntriesCa throws TomcatRunException { Set classLoaderEntries = new HashSet(); -//List classLoaderEntries = new ArrayList( ); -// add classes directories to loader +// add classes directories to loader try { @SuppressWarnings( "unchecked" ) List classPathElements = request.isUseTestClassPath() @@ -162,7 +161,6 @@ public class DefaultClassLoaderEntriesCa } } return new ArrayList( classLoaderEntries ); -//return classLoaderEntries; } private void deleteDirectory( File directory, Log log ) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-95) Add directories to the embedded tomcat classloader (equivalent to shared.loader property in regular tomcat instance).
[ https://issues.apache.org/jira/browse/MTOMCAT-95?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13132543#comment-13132543 ] Hudson commented on MTOMCAT-95: --- Integrated in TomcatMavenPlugin #53 (See [https://builds.apache.org/job/TomcatMavenPlugin/53/]) [MTOMCAT-95] Add directories to the embedded tomcat classloader (equivalent to shared.loader property in regular tomcat instance). olamy : http://svn.apache.org/viewvc/?view=rev&rev=1187231 Files : * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java > Add directories to the embedded tomcat classloader (equivalent to > shared.loader property in regular tomcat instance). > - > > Key: MTOMCAT-95 > URL: https://issues.apache.org/jira/browse/MTOMCAT-95 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 1.1 >Reporter: Nick Lloyd >Assignee: Olivier Lamy >Priority: Minor > Fix For: 2.0 > > Attachments: additionalClasspathDirs.patch > > > For one of my projects I needed to add directories to the classpath of a > tomcat instance. I added additional functionality to tomcat-maven-plugin > v1.1 to support this by adding configured directories to the Embedded tomcat > classloader (only tomcat:run mojo affected). Attached is the patch file of > my modifications. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-77) Add support for using the test classpath instead of the compile classpath with tomcat:run
[ https://issues.apache.org/jira/browse/MTOMCAT-77?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13132544#comment-13132544 ] Hudson commented on MTOMCAT-77: --- Integrated in TomcatMavenPlugin #53 (See [https://builds.apache.org/job/TomcatMavenPlugin/53/]) [MTOMCAT-77] Add support for using the test classpath instead of the compile classpath with tomcat:run. olamy : http://svn.apache.org/viewvc/?view=rev&rev=1187230 Files : * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java > Add support for using the test classpath instead of the compile classpath > with tomcat:run > - > > Key: MTOMCAT-77 > URL: https://issues.apache.org/jira/browse/MTOMCAT-77 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature >Affects Versions: 1.1 > Environment: Maven >Reporter: Oscar Westra van Holthe - Kind >Assignee: Olivier Lamy > Fix For: 2.0 > > > For an _instant developer experience_, we need to be able to do something > like the following: > {code} > svn co https://company.repository.com/project/foo foo > cd foo > mvn install > mvn tomcat:run > {code} > Using the tomcat:run goal in itself works perfectly, but the (in-memory) > database is empty. Using the Jetty plugin, I can choose to use the test > classpath (which tells Hibernate to initialize the database): > {code:xml} > > org.mortbay.jetty > maven-jetty-plugin > 6.1.26 > > true > > /src/test/config/jetty-env.xml > > > > > {code} > I want to do something similar with the Tomcat plugin: > {code:xml} > > org.codehaus.mojo > tomcat-maven-plugin > 1.1 > > true > / > src/test/config/tomcat-context.xml > > > > {code} > So my request is: add a "useTestClasspath" configuration setting for tje > class RunMojo that tells it to use > {{MavenProject.getTestClasspathElements()}} instead of > {{MavenProject.getCompileClasspathElements()}} when creating the webapp > loader. On 2011-02-08, this was line 132 in the class > {{org.codehaus.mojo.tomcat.RunMojo}}. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
2011/10/21 : > Author: olamy > Date: Fri Oct 21 09:15:37 2011 > New Revision: 1187232 > > URL: http://svn.apache.org/viewvc?rev=1187232&view=rev > Log: > prefer Set to prevent duplicate entries > > Modified: > > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java > > Modified: > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java > URL: > http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187232&r1=1187231&r2=1187232&view=diff > == > --- > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java > (original) > +++ > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java > Fri Oct 21 09:15:37 2011 > @@ -38,7 +38,9 @@ import java.io.FilenameFilter; > import java.io.IOException; > import java.util.ArrayList; > import java.util.Collection; > +import java.util.HashSet; > import java.util.List; > +import java.util.Set; > > /** > * @author Olivier Lamy > @@ -56,7 +58,8 @@ public class DefaultClassLoaderEntriesCa > public List calculateClassPathEntries( > ClassLoaderEntriesCalculatorRequest request ) > throws TomcatRunException > { > - List classLoaderEntries = new ArrayList(); > + Set classLoaderEntries = new HashSet(); > + //List classLoaderEntries = new ArrayList( ); Maybe java.util.LinkedHashSet like Tomcat does in org.apache.catalina.startup.ClassLoaderFactory ? So that it will preserve order. (Though I do not know whether it is important for your use case or not). > // add classes directories to loader > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
2011/10/21 Konstantin Kolinko : > 2011/10/21 : >> Author: olamy >> Date: Fri Oct 21 09:15:37 2011 >> New Revision: 1187232 >> >> URL: http://svn.apache.org/viewvc?rev=1187232&view=rev >> Log: >> prefer Set to prevent duplicate entries > >> >> Modified: >> >> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java >> >> Modified: >> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java >> URL: >> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187232&r1=1187231&r2=1187232&view=diff >> == >> --- >> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java >> (original) >> +++ >> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java >> Fri Oct 21 09:15:37 2011 >> @@ -38,7 +38,9 @@ import java.io.FilenameFilter; >> import java.io.IOException; >> import java.util.ArrayList; >> import java.util.Collection; >> +import java.util.HashSet; >> import java.util.List; >> +import java.util.Set; >> >> /** >> * @author Olivier Lamy >> @@ -56,7 +58,8 @@ public class DefaultClassLoaderEntriesCa >> public List calculateClassPathEntries( >> ClassLoaderEntriesCalculatorRequest request ) >> throws TomcatRunException >> { >> - List classLoaderEntries = new ArrayList(); >> + Set classLoaderEntries = new HashSet(); >> + //List classLoaderEntries = new ArrayList( ); > > > Maybe java.util.LinkedHashSet like Tomcat does in > org.apache.catalina.startup.ClassLoaderFactory ? > > So that it will preserve order. > (Though I do not know whether it is important for your use case or not). Agree that can be important in a particular use case when users has dependencies on an other war artifact. (thanks for the catch! ) During dev on tomcat7 integration, I have just noticed that using the embeded Tomcat class and adding a webapp as it: tomcat.addWebapp( contextPath, path to a war file ); If the war file contains a context file ( META-INF/context.xml ) it's not use automatically when adding the context/webapp. So I have to manually add it with: setConfigFile ( new URL( "jar:file:" + warPath + "!/META-INF/context.xml" ) ) (if exists in the war). Do you consider that as an issue ? > >> // add classes directories to loader >> > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy Talend : http://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
svn commit: r1187271 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy Date: Fri Oct 21 10:00:29 2011 New Revision: 1187271 URL: http://svn.apache.org/viewvc?rev=1187271&view=rev Log: use LinkedHashSet to preserve order Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187271&r1=1187270&r2=1187271&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Fri Oct 21 10:00:29 2011 @@ -38,7 +38,7 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -58,7 +58,7 @@ public class DefaultClassLoaderEntriesCa public List calculateClassPathEntries( ClassLoaderEntriesCalculatorRequest request ) throws TomcatRunException { -Set classLoaderEntries = new HashSet(); +Set classLoaderEntries = new LinkedHashSet(); // add classes directories to loader try - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
2011/10/21 Olivier Lamy : > During dev on tomcat7 integration, I have just noticed that using the > embeded Tomcat class and adding a webapp as it: > tomcat.addWebapp( contextPath, path to a war file ); > If the war file contains a context file ( META-INF/context.xml ) it's > not use automatically when adding the context/webapp. > So I have to manually add it with: setConfigFile ( new URL( > "jar:file:" + warPath + "!/META-INF/context.xml" ) ) (if exists in the > war). > > Do you consider that as an issue ? > Do you run unpacked war? What if there is .xml in conf/Catalina/localhost? Currently it would take priority over the one inside the war file. Should it be ignored in your use case? (HostConfig#deployWAR(...)). I think that we use Tomcat class mostly for testing, but there is no test that covers this use case, so no wonder that there is no such code there. I think you can file an enhancement request. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
2011/10/21 Konstantin Kolinko : > 2011/10/21 Olivier Lamy : > >> During dev on tomcat7 integration, I have just noticed that using the >> embeded Tomcat class and adding a webapp as it: >> tomcat.addWebapp( contextPath, path to a war file ); >> If the war file contains a context file ( META-INF/context.xml ) it's >> not use automatically when adding the context/webapp. >> So I have to manually add it with: setConfigFile ( new URL( >> "jar:file:" + warPath + "!/META-INF/context.xml" ) ) (if exists in the >> war). >> >> Do you consider that as an issue ? >> > > Do you run unpacked war? nope a packed war. just using tomcat.addWebapp( contextPath, path to a war file ); > > What if there is .xml in conf/Catalina/localhost? Currently > it would take priority over the one inside the war file. Should it be > ignored in your use case? > > (HostConfig#deployWAR(...)). > > > I think that we use Tomcat class mostly for testing, but there is no > test that covers this use case, so no wonder that there is no such > code there. I think you can file an enhancement request. k > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy Talend : http://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
svn commit: r1187381 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt Date: Fri Oct 21 14:56:10 2011 New Revision: 1187381 URL: http://svn.apache.org/viewvc?rev=1187381&view=rev Log: Re-order so context class loader is always reset for keep-alive timer thread even if the thread has stopped. Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1187381&r1=1187380&r2=1187381&view=diff == --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Oct 21 14:56:10 2011 @@ -2196,11 +2196,6 @@ public class WebappClassLoader continue; } -// Skip threads that have already died -if (!thread.isAlive()) { -continue; -} - // JVM controlled threads ThreadGroup tg = thread.getThreadGroup(); if (tg != null && @@ -2218,6 +2213,11 @@ public class WebappClassLoader continue; } +// Skip threads that have already died +if (!thread.isAlive()) { +continue; +} + // TimerThread can be stopped safely so treat separately if (thread.getClass().getName().equals( "java.util.TimerThread") && - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187387 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt Date: Fri Oct 21 15:07:51 2011 New Revision: 1187387 URL: http://svn.apache.org/viewvc?rev=1187387&view=rev Log: Ensure the the memory leak protection for the HttpClient keep-alive always operates even if the thread has already stopped. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 21 15:07:51 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1187387&r1=1187386&r2=1187387&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/ca
Re: ApacheMeetupsNa11 tomcat one?
All, On 10/20/2011 4:32 PM, Christopher Schultz wrote: > I'm arriving at 12:47 local time on Tuesday and I've got nothing to do > until the next morning besides check-into the hotel. > > If anyone is interested in getting together for some drinks or exploring > the city (I've never been to Vancouver) on Thursday s/Thursday/Tuesday/ Sorry for the confusion. -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1187387 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
2011/10/21 : > Author: markt > Date: Fri Oct 21 15:07:51 2011 > New Revision: 1187387 > > URL: http://svn.apache.org/viewvc?rev=1187387&view=rev > Log: > Ensure the the memory leak protection for the HttpClient keep-alive always > operates even if the thread has already stopped. > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java > tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 1. +1 to backport WebappClassLoader fix. 2. This committed two revisions: Merged /tomcat/trunk:r1187028,1187381 Where r1187028 was Catalina.java "Remove Java 1.2 error handling" I am OK with that, but maybe you want to update the commit message or changelog. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Remove svn keywords (was: svn commit: r1187018 [1/2] - in /tomcat/trunk)
2011/10/20 : > Author: markt > Date: Thu Oct 20 19:52:47 2011 > New Revision: 1187018 > > URL: http://svn.apache.org/viewvc?rev=1187018&view=rev > Log: > Clean-up. No functional change. > > Modified: > tomcat/trunk/TOMCAT-NEXT.txt (...) > --- tomcat/trunk/TOMCAT-NEXT.txt (original) > +++ tomcat/trunk/TOMCAT-NEXT.txt Thu Oct 20 19:52:47 2011 > @@ -42,4 +42,8 @@ but possibly 7.1.x). > > 8. Review the connector shutdown code for timing and threading issues > particularly any that may result in a client socket being left open after a > - connector.stop(). > \ No newline at end of file > + connector.stop(). > + > +9. Remove all the static info attributes and associated getters. > + > +10. Remove the svn keywords from all the files. OK for *.java, but let's keep them in *.txt Or they cause problems with your usage of Git? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Question regarding of an implementation of a custom Valve
Hi guys, for some reasons, I need to implement a Valve within Tomcat 6, and everything's running smoothely. I put the Valve into my Context-definition, fire up Tomcat & there we go. However, I just don't see how I can access any parameters inside the Valve-specification inside the Context-definition. Let's say I have the following Valve-definition inside my Context: How can I access the attribute "path" in the above definition? I looked up the source of AccesslogValve, but I didn't see any browsing of the Is it that I just have to specify a getter / setter inside my Valve-source for the corresponding attribute inside the Valve-specification, and it will be picked up automatically? Sorry if this is a lame question, but I'm not into Tomcat's source, and before spending hours and hours, I'd rather ask the guys who should know ;) TIA! Gregor -- just because you're paranoid, don't mean they're not after you... gpgp-fp: 3DB13F197F8A0360814885D1F1F1E2EFAD509AFD skype:rc46fi gplus.to/gregor twitter.com/#/2smart4u - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Question regarding of an implementation of a custom Valve
On Fri, Oct 21, 2011 at 19:26, Gregor S. wrote: > Hi guys, > > for some reasons, I need to implement a Valve within Tomcat 6, and > everything's running smoothely. > > I put the Valve into my Context-definition, fire up Tomcat & there we go. > > However, I just don't see how I can access any parameters inside the > Valve-specification inside the Context-definition. > > Let's say I have the following Valve-definition inside my Context: > > path="somePath"/> > > How can I access the attribute "path" in the above definition? > > I looked up the source of AccesslogValve, but I didn't see any > browsing of the > > Is it that I just have to specify a getter / setter inside my > Valve-source for the corresponding attribute inside the > Valve-specification, and it will be picked up automatically? > Yes, exactly. In your case, .getPath() and .setPath(String). -- Francis Galiegue, fgalie...@gmail.com "It seems obvious [...] that at least some 'business intelligence' tools invest so much intelligence on the business side that they have nothing left for generating SQL queries" (Stéphane Faroult, in "The Art of SQL", ISBN 0-596-00894-5) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187488 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Oct 21 18:33:45 2011 New Revision: 1187488 URL: http://svn.apache.org/viewvc?rev=1187488&view=rev Log: Add info from back-port of r1187028 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1187488&r1=1187487&r2=1187488&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 21 18:33:45 2011 @@ -123,6 +123,10 @@ Ensure the the memory leak protection for the HttpClient keep-alive always operates even if the thread has already stopped. (markt) + +Remove the Java 1.2 specific error handling around the adding of the +shutdown hook. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1187387 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
On 21/10/2011 16:44, Konstantin Kolinko wrote: > 2011/10/21 : >> Author: markt >> Date: Fri Oct 21 15:07:51 2011 >> New Revision: 1187387 >> >> URL: http://svn.apache.org/viewvc?rev=1187387&view=rev >> Log: >> Ensure the the memory leak protection for the HttpClient keep-alive always >> operates even if the thread has already stopped. >> >> Modified: >>tomcat/tc7.0.x/trunk/ (props changed) >> >> tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java >>tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java >>tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > 1. +1 to backport WebappClassLoader fix. > > 2. This committed two revisions: > Merged /tomcat/trunk:r1187028,1187381 > > Where r1187028 was Catalina.java "Remove Java 1.2 error handling" Sorry. I thought I committed that last night but must have slipped up. I need to get a shorter to-do list and slow down. > I am OK with that, but maybe you want to update the commit message or > changelog. Will do. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1187387 - svn:log
Author: markt Revision: 1187387 Modified property: svn:log Modified: svn:log at Fri Oct 21 18:34:30 2011 -- --- svn:log (original) +++ svn:log Fri Oct 21 18:34:30 2011 @@ -1 +1,3 @@ Ensure the the memory leak protection for the HttpClient keep-alive always operates even if the thread has already stopped. + +Remove Java 1.2 error handling from around the adding of the shutdown hook. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Add link or reference to "Monitoring and Managing Tomcat" documentation
Hi, Is it possible to add a reference to the "JMX Remote Lifecycle Listener" in the "Monitoring and Managing Tomcat" documentation part ? Why: in page http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html there's mention of : "Note:The JSR 160 JMX-Adaptor opens a second data channel on a random port. That is a problem when you have a local firewall installed." It would be usefull to users (like me ;-) ) to know that the "JMX Remote Lifecycle Listener" could fix port. Thanks - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187561 [2/2] - in /tomcat/tc7.0.x/trunk: ./ maven/ maven/tomcat-annotations-api/ maven/tomcat-api/ maven/tomcat-catalina-ant/ maven/tomcat-catalina-ha/ maven/tomcat-catalina-jmx-remote/
Added: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml?rev=1187561&view=auto == --- tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml (added) +++ tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml Fri Oct 21 21:41:30 2011 @@ -0,0 +1,76 @@ + + +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.tomcat +tomcat-parent +7.0.23-SNAPSHOT + + tomcat-jsp-api + + JSP package + + + org.apache.tomcat + tomcat-el-api + ${project.version} + compile + + + org.apache.tomcat + tomcat-servlet-api + ${project.version} + compile + + + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +copy_java_files +generate-sources + + + + + + + + + + + + run + + + + + + + + Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml -- svn:keywords = Author Date Id Revision Added: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml?rev=1187561&view=auto == --- tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml (added) +++ tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml Fri Oct 21 21:41:30 2011 @@ -0,0 +1,62 @@ + + +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.tomcat +tomcat-parent +7.0.23-SNAPSHOT + + + tomcat-juli + + Tomcat Core Logging Package + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +copy_java_files +generate-sources + + + + + + + + + + + + run + + + + + + + Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml -- svn:keywords = Author Date Id Revision Added: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml?rev=1187561&view=auto == --- tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml (added) +++ tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml Fri Oct 21 21:41:30 2011 @@ -0,0 +1,61 @@ + + +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.tomcat +tomcat-parent +7.0.23-SNAPSHOT + + tomcat-mail-api + + javax.mail package + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +copy_java_files +generate-sources + + + + + + + + + + + + run + + + + + + + Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml -- svn:eol-style = native Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml -- svn:keywords = Author Date Id Revision Added: tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml?rev=1187561&view=auto ===
Re: Publishing zips to the maven repo
So I have just commit some stuff in r 1187561. Note: Sources layout not touched. Currently only maven artifacts are build (I will work later on distrib). to test it on the top of https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk. Just use: mvn -f maven/pom.xml clean install. Currently some unit tests are failing (so use -DskipTests). I will try to fix that too. 2011/10/14 Olivier Lamy : > Hello, > I can maybe help here. > A solution I have in mind to not change sources layout. > http://svn.apache.org/repos/asf/tomcat/trunk/ > /maven/pom.xml (root pom.xml here) > /tomcat-coyote/pom.xml > etc.. one module for each artifact to produce > plus a module to package the distro. > > in each module, compiler plugin will be configured to use only a set > of java files. > This won't change the current sources layout > > As an example, this solution is used by the selenium project: > http://selenium.googlecode.com/svn/trunk/maven/ > > I can maybe try to work on that and provide a patch. > Or at least commit in trunk (if I have no layout changes to do). > > But not before end of next week or early week after. > > 2011/10/14 Konstantin Kolinko : >> 2011/10/14 Henri Gomez : This is the first time that I can recall that anyone has stated that there is a requirement for this. >>> >>> I should say many companies, including mine are injecting full Tomcat (as >>> zip) in their enterprise repositories (Archiva/Nexus/Artifactory powered) >> >> Are all those related to Maven? Do they publish only zips, or the full >> set of tgz and zips (~80Mb) ? >> >> Keeping an in-house copy of 3rd party library is a different story, >> and it is needed regardless of whether somebody uses Maven Central to >> publish their work. >> >> I personally am using Apache Ivy [1] to manage my repository of >> dependencies, and AFAIK it can download not only from maven, but from >> any other structured repository as well. >> >> [1] http://ant.apache.org/ivy/ >> >>> >>> BTW, did there is a strong -1 to have an alternative build system using >>> Maven if this build keep the current Tomcat structure ? >>> >> >> There are not may people here to support it here if it breaks, and on >> RTC branches that would require 3+ committers that understand what >> happens. >> >> >> There was some discussion here on dev@ about 2 years ago, and some >> person proposed to create a maven build, but he disappeared never >> showing anything working. >> >> Best regards, >> Konstantin Kolinko >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > > > > -- > Olivier Lamy > Talend : http://talend.com > http://twitter.com/olamy | http://linkedin.com/in/olamy > -- Olivier Lamy Talend : http://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
svn commit: r1187571 - /tomcat/tc7.0.x/trunk/.gitignore
Author: olamy Date: Fri Oct 21 21:59:52 2011 New Revision: 1187571 URL: http://svn.apache.org/viewvc?rev=1187571&view=rev Log: add a basic .gitignore Added: tomcat/tc7.0.x/trunk/.gitignore Added: tomcat/tc7.0.x/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/.gitignore?rev=1187571&view=auto == --- tomcat/tc7.0.x/trunk/.gitignore (added) +++ tomcat/tc7.0.x/trunk/.gitignore Fri Oct 21 21:59:52 2011 @@ -0,0 +1,6 @@ +target +output +build.properties +work +logs +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187576 - in /tomcat/tc7.0.x/trunk/maven: ./ tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/
Author: olamy Date: Fri Oct 21 22:10:39 2011 New Revision: 1187576 URL: http://svn.apache.org/viewvc?rev=1187576&view=rev Log: ignore target directory in the maven build Modified: tomcat/tc7.0.x/trunk/maven/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-coyote/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-el-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-jasper/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-es/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-fr/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-ja/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jasper/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-juli/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-tests/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-tribes/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-util/ (props changed) Propchange: tomcat/tc7.0.x/trunk/maven/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-coyote/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-el-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-jasper/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/ -
DO NOT REPLY [Bug 52071] New: base.path basic choice (/usr/share/java) in build.properties.default is problematic
https://issues.apache.org/bugzilla/show_bug.cgi?id=52071 Bug #: 52071 Summary: base.path basic choice (/usr/share/java) in build.properties.default is problematic Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Packaging AssignedTo: dev@tomcat.apache.org ReportedBy: fgalie...@gmail.com Classification: Unclassified It is problematic for at least two reasons: * it has quite a few chances to be a directory in use by the base operating system; * if tomcat is built as root (which shouldn't happen but still), there may be the possibility to alter the contents of this directory. Suggestions: * change it to /var/tmp/tomcat-build, or the like; * or don't define it at all in build.properties.default and raise an error at build time if user hasn't defined it in its own build.properties. -- 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: r1187590 - in /tomcat/tc7.0.x/trunk/maven: tomcat-catalina-ha/pom.xml tomcat-catalina/pom.xml tomcat-coyote/pom.xml tomcat-el-api/pom.xml tomcat-jasper/pom.xml tomcat-servlet-api/pom.xml t
Author: olamy Date: Fri Oct 21 23:06:26 2011 New Revision: 1187590 URL: http://svn.apache.org/viewvc?rev=1187590&view=rev Log: fix inclusion of some default *.properties files Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Fri Oct 21 23:06:26 2011 @@ -63,8 +63,17 @@ + + + +../../java/ + + org/apache/catalina/ha/**/LocalStrings.properties + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml Fri Oct 21 23:06:26 2011 @@ -75,6 +75,15 @@ + + +../../java/ + + org/apache/catalina/**/LocalStrings.properties + org/apache/naming/**/LocalStrings.properties + + + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml Fri Oct 21 23:06:26 2011 @@ -44,8 +44,24 @@ + + + +../../java/ + + org/apache/coyote/**/LocalStrings.properties + org/apache/util/**/LocalStrings.properties + org/apache/catalina/util/CharsetMapperDefault.properties + + + org/apache/util/file/** + org/apache/util/res/** + org/apache/util/scan/** + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml Fri Oct 21 23:06:26 2011 @@ -31,6 +31,14 @@ Expression language package + + +../../java/ + + javax/el/**/LocalStrings.properties + + + @@ -59,4 +67,5 @@ + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml Fri Oct 21 23:06:26 2011 @@ -87,8 +87,17 @@ + + + +../../java/ + + org/apache/jasper/**/LocalStrings.properties + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml Fri Oct 21 23:06:26 2011 @@ -31,6 +31,14 @@ javax.servlet package + + +../../java/ + + javax/servlet/**/LocalStrings.properties + + + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/tr