Re: svn commit: r1382367 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/ webapps/docs/config/

[Mark Thomas]

Keiichi Fujino  wrote:

>>  /**
>> + * Check for old versions of applications using parallel
>deployment that are
>> + * now unused (have no active sessions) and undeploy any that
>are found.
>> + */



>> +if (context != null) {
>> +Manager manager = context.getManager();
>> +if (manager != null &&
>manager.getActiveSessions() == 0) {
>
>manager.getActiveSessions() returns the various numbers of sessions
>according to the kind of Manager.
>
>1.
>In BackupManager, manager.getActiveSessions() returns the number of a
>primary and backup sessions.
>A proxy session is not contained.
>Thus manager only with a proxy session will be deleted.
>(e.g. manager which newly joined in the cluster has only a proxy
>session.)
>It is necessary to call DistributedManager#getActiveSessionsFull()
>instead of manager.getActiveSessions().
>
>2.
>In PersistentManage, it may be necessary to take into consideration
>also about the session saved in Store.
>It should be deleted only when both manager.getActiveSessions() and
>Store#getSize are 0.
>
>Although it is possible to add these two cases,
>It seems that it is better to define method which checks number of
>sessions in a Manager/ManagerBase.

I agree that this does need to be addressed although I prefer a slightly 
different approach.

If DistributedManager is added to PersistentManagerBase then that will have 
several advantages:
- sessions in the store will be reported as proxy sessions in the Manager 
application (currently they are completely ignored)
- the auto-undeploy code can check for an instance of DistributedManager and 
use getActiveSessionsFull() in that case.

The Javadoc for DistributedManager will need some small tweaks to update it to 
the slightly wider use but this use is in keeping with what I had in mind when 
I introduced DistributedManager.

Mark

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

Re: svn commit: r1381781 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

[Olivier Lamy]

2012/9/8 Konstantin Kolinko :
> 2012/9/7  :
>> Author: olamy
>> Date: Thu Sep  6 22:18:30 2012
>> New Revision: 1381781
>>
>> URL: http://svn.apache.org/viewvc?rev=1381781&view=rev
>> Log:
>> [MTOMCAT-174] tomcatConfigurationFilesDirectory is not implemented
>>
>> Submitted by Robin Böhm.
>>
>> Modified:
>> 
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>>
>
>> +// Each File
>> +for ( String aIncludeFileName : directoryScanner.getIncludedFiles() 
>> )
>> +{
>> +getLog().debug( "include configuration file : " + 
>> pDestinationPath + aIncludeFileName );
>> +File aInputFile = new File( pSourceFolder, aIncludeFileName );
>> +
>> +FileInputStream aSourceFileInputStream = new FileInputStream( 
>> aInputFile );
>> +
>> +pArchiveOutputSteam.putArchiveEntry( new JarArchiveEntry( 
>> pDestinationPath + aIncludeFileName ) );
>> +IOUtils.copy( aSourceFileInputStream, pArchiveOutputSteam );
>> +pArchiveOutputSteam.closeArchiveEntry();
>> +
>> +}
>> +
>> +/*
>> +// Each Dir
>
> Why this code block is commented-out with /*..*/?
my bad.
>
> There might be subdirectories in the configuration area (the usual one
> is Catalina/localhost). They may contain context files for
> applications, and "context.xml.default" file for specific host.
Yes it's already the case. I have just improved it test to ensure it works.
>
>> +for (String aIncludeDir : 
>> directoryScanner.getIncludedDirectories()) {
>> +File aSubDir = new File(pSourceFolder + "/" + aIncludeDir);
>> +if(!pSourceFolder.equals(aSubDir)){
>> +getLog().debug("include configuration dir : " + 
>> pDestinationPath + "/" + aIncludeDir);
>> +copyDirectoryContentIntoArchive(new File(pSourceFolder + 
>> "/" + aIncludeDir), pDestinationPath + "/" + aIncludeDir, 
>> pArchiveOutputSteam);
>> +}
>> +}
>> +*/
>
> 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://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

svn commit: r1382739 - in /tomcat/maven-plugin/trunk: ./ tomcat7-maven-plugin/src/it/simple-war-exec-project/ tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/ tomcat7-

[olamy]

Author: olamy
Date: Mon Sep 10 10:27:06 2012
New Revision: 1382739

URL: http://svn.apache.org/viewvc?rev=1382739&view=rev
Log:
improve it test to ensure Catalina/* directories are added too

Added:

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
   (with props)
Modified:
tomcat/maven-plugin/trunk/pom.xml

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1382739&r1=1382738&r2=1382739&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Sep 10 10:27:06 2012
@@ -660,6 +660,11 @@
   
 
 
+  org.apache.maven.plugins
+  maven-invoker-plugin
+  1.7
+
+
   org.codehaus.plexus
   plexus-component-metadata
   1.5.5

Added: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml?rev=1382739&view=auto
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
 Mon Sep 10 10:27:06 2012
@@ -0,0 +1,18 @@
+
+
+

Propchange: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
--
svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/tomcatconf/Catalina/localhost/manager.xml
--
svn:keywords = Author Date Id Revision

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh?rev=1382739&r1=1382738&r2=1382739&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
 Mon Sep 10 10:27:06 2012
@@ -65,6 +65,16 @@ try
 System.err.println( "conf/server.xml is missing." );
 return false;
 }
+if (!contents.contains("conf/logging.properties") )
+{
+System.err.println( "conf/logging.properties is missing." );
+return false;
+}
+if (!contents.contains("conf/Catalina/localhost/manager.xml") )
+{
+System.err.println( "conf/Catalina/localhost/manager.xml is missing." 
);
+return false;
+}
 if (!contents.contains("tomcat.standalone.properties") )
 {
 System.err.println( "tomcat.standalone.properties is missing." );



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

Re: svn commit: r1381781 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

[Robin Böhm]

Am 10.09.2012 um 12:16 schrieb Olivier Lamy :

> 2012/9/8 Konstantin Kolinko :
>> 2012/9/7  :
>>> Author: olamy
>>> Date: Thu Sep  6 22:18:30 2012
>>> New Revision: 1381781
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=1381781&view=rev
>>> Log:
>>> [MTOMCAT-174] tomcatConfigurationFilesDirectory is not implemented
>>> 
>>> Submitted by Robin Böhm.
>>> 
>>> Modified:
>>>
>>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
>>> 
>> 
>>> +// Each File
>>> +for ( String aIncludeFileName : 
>>> directoryScanner.getIncludedFiles() )
>>> +{
>>> +getLog().debug( "include configuration file : " + 
>>> pDestinationPath + aIncludeFileName );
>>> +File aInputFile = new File( pSourceFolder, aIncludeFileName );
>>> +
>>> +FileInputStream aSourceFileInputStream = new FileInputStream( 
>>> aInputFile );
>>> +
>>> +pArchiveOutputSteam.putArchiveEntry( new JarArchiveEntry( 
>>> pDestinationPath + aIncludeFileName ) );
>>> +IOUtils.copy( aSourceFileInputStream, pArchiveOutputSteam );
>>> +pArchiveOutputSteam.closeArchiveEntry();
>>> +
>>> +}
>>> +
>>> +/*
>>> +// Each Dir
>> 
>> Why this code block is commented-out with /*..*/?
> my bad.
>> 
>> There might be subdirectories in the configuration area (the usual one
>> is Catalina/localhost). They may contain context files for
>> applications, and "context.xml.default" file for specific host.
> Yes it's already the case. I have just improved it test to ensure it works.
This Code is not tested now, i just send it to you that you have a base to 
implemented this next step :)
Next time i will send it in a different file ;)
>> 
>>> +for (String aIncludeDir : 
>>> directoryScanner.getIncludedDirectories()) {
>>> +File aSubDir = new File(pSourceFolder + "/" + aIncludeDir);
>>> +if(!pSourceFolder.equals(aSubDir)){
>>> +getLog().debug("include configuration dir : " + 
>>> pDestinationPath + "/" + aIncludeDir);
>>> +copyDirectoryContentIntoArchive(new File(pSourceFolder + 
>>> "/" + aIncludeDir), pDestinationPath + "/" + aIncludeDir, 
>>> pArchiveOutputSteam);
>>> +}
>>> +}
>>> +*/
>> 
>> 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://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
> 


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

svn commit: r1382740 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

[olamy]

Author: olamy
Date: Mon Sep 10 10:27:22 2012
New Revision: 1382740

URL: http://svn.apache.org/viewvc?rev=1382740&view=rev
Log:
remove commented code

Modified:

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

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1382740&r1=1382739&r2=1382740&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 Mon Sep 10 10:27:22 2012
@@ -69,45 +69,45 @@ public abstract class AbstractExecWarMoj
 extends AbstractTomcat7Mojo
 {
 
-@Parameter ( defaultValue = "${project.artifact}", required = true, 
readonly = true )
+@Parameter (defaultValue = "${project.artifact}", required = true, 
readonly = true)
 private Artifact projectArtifact;
 
 /**
  * The maven project.
  */
-@Parameter ( defaultValue = "${project}", required = true, readonly = true 
)
+@Parameter (defaultValue = "${project}", required = true, readonly = true)
 protected MavenProject project;
 
-@Parameter ( defaultValue = "${plugin.artifacts}", required = true )
+@Parameter (defaultValue = "${plugin.artifacts}", required = true)
 private List pluginArtifacts;
 
-@Parameter ( defaultValue = "${project.build.directory}" )
+@Parameter (defaultValue = "${project.build.directory}")
 private File buildDirectory;
 
 /**
  * Path under {@link #buildDirectory} where this mojo may do temporary 
work.
  */
-@Parameter ( defaultValue = 
"${project.build.directory}/tomcat7-maven-plugin-exec" )
+@Parameter (defaultValue = 
"${project.build.directory}/tomcat7-maven-plugin-exec")
 private File pluginWorkDirectory;
 
-@Parameter ( property = "maven.tomcat.exec.war.tomcatConf", defaultValue = 
"src/main/tomcatconf" )
+@Parameter (property = "maven.tomcat.exec.war.tomcatConf", defaultValue = 
"src/main/tomcatconf")
 private File tomcatConfigurationFilesDirectory;
 
-@Parameter ( defaultValue = "src/main/tomcatconf/server.xml", property = 
"maven.tomcat.exec.war.serverXml" )
+@Parameter (defaultValue = "src/main/tomcatconf/server.xml", property = 
"maven.tomcat.exec.war.serverXml")
 private File serverXml;
 
 /**
  * Name of the generated exec JAR.
  */
-@Parameter ( property = "tomcat.jar.finalName",
- defaultValue = 
"${project.artifactId}-${project.version}-war-exec.jar", required = true )
+@Parameter (property = "tomcat.jar.finalName",
+defaultValue = 
"${project.artifactId}-${project.version}-war-exec.jar", required = true)
 private String finalName;
 
 /**
  * The webapp context path to use for the web application being run.
  * The name to store webapp in exec jar. Do not use /
  */
-@Parameter ( property = "maven.tomcat.path", defaultValue = 
"${project.artifactId}", required = true )
+@Parameter (property = "maven.tomcat.path", defaultValue = 
"${project.artifactId}", required = true)
 protected String path;
 
 @Parameter
@@ -125,13 +125,13 @@ public abstract class AbstractExecWarMoj
 /**
  * Location of the local repository.
  */
-@Parameter ( defaultValue = "${localRepository}", required = true, 
readonly = true )
+@Parameter (defaultValue = "${localRepository}", required = true, readonly 
= true)
 private ArtifactRepository local;
 
 /**
  * List of Remote Repositories used by the resolver
  */
-@Parameter ( defaultValue = "${project.remoteArtifactRepositories}", 
required = true, readonly = true )
+@Parameter (defaultValue = "${project.remoteArtifactRepositories}", 
required = true, readonly = true)
 protected List remoteRepos;
 
 @Component
@@ -140,35 +140,35 @@ public abstract class AbstractExecWarMoj
 /**
  * Attach or not the generated artifact to the build (use true if you want 
to install or deploy it)
  */
-@Parameter ( property = "maven.tomcat.exec.war.attachArtifact", 
defaultValue = "true", required = true )
+@Parameter (property = "maven.tomcat.exec.war.attachArtifact", 
defaultValue = "true", required = true)
 private boolean attachArtifact;
 
 
 /**
  * the classifier to use for the attached/generated artifact
  */
-@Parameter ( property = "maven.tomcat.exec.war.attachArtifactClassifier", 
defaultValue = "exec-war",
- required = true )
+@Parameter (propert

Re: Release date of tomcat7-maven-plugin 2.0

[Franken, Arne]

Hi Olivier,

Now that Tomcat 7.0.30 is released, are you releasing tomcat7-maven-plugin
2.0 soon (today) or are you still waiting on a third party?

We want to release our software tomorrow and are already depending on tomcat
7.0.30.

Is it possible for you to release the plugin today?

My backup plan is to release the plugin internally myself, but the software
will used by our customers which would have to get their hands on the
artifacts...

Cheers,
Arne


Am 8/26/12 2:33 PM schrieb "Olivier Lamy" unter :

> Hi
> Something to release first on maven side.
> Then should be ok.
> 
> --
> Olivier
> Send from a vt100 phone console
> Le 23 août 2012 14:37, "Franken, Arne"  a
> écrit :
> 
>> Hi,
>> 
>> I wanted to inquire again about the 2.0 release date, in your last email
>> you
>> said it would probably be this week.
>> 
>> Is this still the case?
>> 
>> I guess that I may be responsible for any delays by raising
>> https://issues.apache.org/jira/browse/MTOMCAT-173 against version 2.0 ;-)
>> My last comment describes a workaround that is currently working for me, so
>> the bug could be fixed in 2.1.
>> 
>> Cheers,
>> Arne
>> 
>> 
>> Am 8/8/12 11:58 PM schrieb "Olivier Lamy" unter :
>> 
>>> Hi,
>>> Sure I wanted to release 2.0 soon.
>>> I have a week vacations next week. So will be week after :-).
>>> 
>>> 2012/8/8 Franken, Arne :
 Hi,
 
 I was wondering when I could expect a 2.0 release (or at least a new
>> beta
 release) of the tomcat7-maven-plugin.
 Did you already set a release date?
 
 I am asking because the fix for
 https://issues.apache.org/jira/browse/MTOMCAT-136
 Isn¹t included in 2.0-beta-1.
 
 Cheers,
 Arne



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

Re: Release date of tomcat7-maven-plugin 2.0

[Olivier Lamy]

Hi,

2012/9/10 Franken, Arne :
> Hi Olivier,
>
> Now that Tomcat 7.0.30 is released, are you releasing tomcat7-maven-plugin
> 2.0 soon (today) or are you still waiting on a third party?
Yes it's the goal, I will start the release process.
>
> We want to release our software tomorrow and are already depending on tomcat
> 7.0.30.
>
> Is it possible for you to release the plugin today?

I will start the release, so you will access to candidate release
artifacts (Official ones will be available after the 3 days period
vote)

>
> My backup plan is to release the plugin internally myself, but the software
> will used by our customers which would have to get their hands on the
> artifacts...
>
> Cheers,
> Arne
>
>
> Am 8/26/12 2:33 PM schrieb "Olivier Lamy" unter :
>
>> Hi
>> Something to release first on maven side.
>> Then should be ok.
>>
>> --
>> Olivier
>> Send from a vt100 phone console
>> Le 23 août 2012 14:37, "Franken, Arne"  a
>> écrit :
>>
>>> Hi,
>>>
>>> I wanted to inquire again about the 2.0 release date, in your last email
>>> you
>>> said it would probably be this week.
>>>
>>> Is this still the case?
>>>
>>> I guess that I may be responsible for any delays by raising
>>> https://issues.apache.org/jira/browse/MTOMCAT-173 against version 2.0 ;-)
>>> My last comment describes a workaround that is currently working for me, so
>>> the bug could be fixed in 2.1.
>>>
>>> Cheers,
>>> Arne
>>>
>>>
>>> Am 8/8/12 11:58 PM schrieb "Olivier Lamy" unter :
>>>
 Hi,
 Sure I wanted to release 2.0 soon.
 I have a week vacations next week. So will be week after :-).

 2012/8/8 Franken, Arne :
> Hi,
>
> I was wondering when I could expect a 2.0 release (or at least a new
>>> beta
> release) of the tomcat7-maven-plugin.
> Did you already set a release date?
>
> I am asking because the fix for
> https://issues.apache.org/jira/browse/MTOMCAT-136
> Isn¹t included in 2.0-beta-1.
>
> Cheers,
> Arne
>
>
>
> -
> 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

svn commit: r1382772 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml

[olamy]

Author: olamy
Date: Mon Sep 10 11:50:02 2012
New Revision: 1382772

URL: http://svn.apache.org/viewvc?rev=1382772&view=rev
Log:
add a firefox profile in selenium test

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml?rev=1382772&r1=1382771&r2=1382772&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp-it/pom.xml
 Mon Sep 10 11:50:02 2012
@@ -202,6 +202,12 @@
 
   
 
+  firefox
+  
+*firefox
+  
+
+
   chrome
   
 *googlechrome



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

[Bug 53847] New: High CPU usage in tamcat native 1.22+

[bugzilla]

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

  Priority: P2
Bug ID: 53847
  Assignee: dev@tomcat.apache.org
   Summary: High CPU usage in tamcat native 1.22+
  Severity: normal
Classification: Unclassified
OS: Linux
  Reporter: asode...@agnitas.de
  Hardware: Other
Status: NEW
   Version: 1.1.22
 Component: Library
   Product: Tomcat Native

Hello Tomcat developers,

We use:
Tomcat-Native 1.1.20
Java 1.6.0_33 (32 Bit and 64 Bit)
Apache-Tomcat 6.0.32 (higher versions also need higher tomcat-native version)
Apr Versione are from OS (RHEL 5:apr-1.2.7-11.el5_6.5, RHEL 6:
apr-1.3.9-5.el6_2.x86_64)


When requesting dynamic content from our tomcat via https from various clients
we get a permanent cpu usage of 100% within a short time, even when the
requests are done.

We checked the following versions:
tomcat-native 1.1.20 -> All OK
tomcat-native 1.1.22 -> 100% CPU Usage
tomcat-native 1.1.23 -> 100% CPU Usage
tomcat-native 1.1.24 -> 100% CPU Usage

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

[Bug 53847] High CPU usage in tomcat native 1.22+

[bugzilla]

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

Andreas Soderer  changed:

   What|Removed |Added

Summary|High CPU usage in tamcat|High CPU usage in tomcat
   |native 1.22+|native 1.22+

-- 
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: r1382779 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml

[olamy]

Author: olamy
Date: Mon Sep 10 12:01:35 2012
New Revision: 1382779

URL: http://svn.apache.org/viewvc?rev=1382779&view=rev
Log:
now possible to run integration tests with the browser I prefer

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

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1382779&r1=1382778&r2=1382779&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Mon Sep 10 
12:01:35 2012
@@ -38,8 +38,9 @@
   
 2.2
 ${project.version}
-clean,pre-integration-test
-clean,install
+firefox
+
clean,pre-integration-test,-P${tomcatPluginSeleniumBrowser}
+
clean,install,-P${tomcatPluginSeleniumBrowser}
   
   
 
@@ -112,8 +113,8 @@
 
   headless
   
-
clean,pre-integration-test,-Pheadless
-clean,install,-Pheadless
+
clean,pre-integration-test,-Pheadless,-P$(tomcatPluginSeleniumBrowser}
+
clean,install,-Pheadless,,-P$(tomcatPluginSeleniumBrowser}
   
 
   



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

svn commit: r1382784 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml tomcat-maven-archetype/pom.xml tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml tomcat7-mave

[olamy]

Author: olamy
Date: Mon Sep 10 12:05:50 2012
New Revision: 1382784

URL: http://svn.apache.org/viewvc?rev=1382784&view=rev
Log:
[maven-release-plugin] prepare release tomcat-maven-plugin-2.0

Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml

Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Sep 10 
12:05:50 2012
@@ -24,7 +24,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.0-SNAPSHOT
+2.0
   
   common-tomcat-maven-plugin
   Apache Tomcat Maven Plugin :: Common API

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Sep 10 12:05:50 2012
@@ -32,7 +32,7 @@
   tomcat-maven-plugin
   pom
   Apache Tomcat Maven Plugin
-  2.0-SNAPSHOT
+  2.0
   The Tomcat Maven Plugin provides goals to manipulate WAR 
projects within the Tomcat servlet
 container.
   
@@ -71,7 +71,7 @@
 7.0.30
 
 
-
+
   
 
   
@@ -226,9 +226,9 @@
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/
-http://svn.apache.org/viewvc/tomcat/maven-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
+
scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
+
http://svn.apache.org/viewvc/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
   
 
   
@@ -861,7 +861,7 @@
 
   tc-staging
   
-
+
   
 
   

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Mon Sep 10 
12:05:50 2012
@@ -23,7 +23,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0-SNAPSHOT
+2.0
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Mon Sep 10 
12:05:50 2012
@@ -22,7 +22,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0-SNAPSHOT
+2.0
   
   4.0.0
 

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Sep 10 12:05:50 
2012
@@ -21,7 +21,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0-SNAPSHOT
+2.0
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Mon Sep 10 12:05:50 
2012
@@ -23,7 +23,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.0-SNAPSHOT
+2.0
   
   tomcat7-maven-plugin
   maven-plugin

Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml?rev=1382784&r1=1382783&r2=1382784&view=diff
==

svn commit: r1382785 - /tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0/

[olamy]

Author: olamy
Date: Mon Sep 10 12:05:55 2012
New Revision: 1382785

URL: http://svn.apache.org/viewvc?rev=1382785&view=rev
Log:
[maven-release-plugin]  copy for tag tomcat-maven-plugin-2.0

Added:
tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0/
  - copied from r1382784, tomcat/maven-plugin/trunk/


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

svn commit: r1382786 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml tomcat-maven-archetype/pom.xml tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml tomcat7-mave

[olamy]

Author: olamy
Date: Mon Sep 10 12:06:00 2012
New Revision: 1382786

URL: http://svn.apache.org/viewvc?rev=1382786&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml

Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Sep 10 
12:06:00 2012
@@ -24,7 +24,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.0
+2.1-SNAPSHOT
   
   common-tomcat-maven-plugin
   Apache Tomcat Maven Plugin :: Common API

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Sep 10 12:06:00 2012
@@ -32,7 +32,7 @@
   tomcat-maven-plugin
   pom
   Apache Tomcat Maven Plugin
-  2.0
+  2.1-SNAPSHOT
   The Tomcat Maven Plugin provides goals to manipulate WAR 
projects within the Tomcat servlet
 container.
   
@@ -226,9 +226,9 @@
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
-
http://svn.apache.org/viewvc/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0
+
scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/
+
scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/
+http://svn.apache.org/viewvc/tomcat/maven-plugin/
   
 
   

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Mon Sep 10 
12:06:00 2012
@@ -23,7 +23,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0
+2.1-SNAPSHOT
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Mon Sep 10 
12:06:00 2012
@@ -22,7 +22,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0
+2.1-SNAPSHOT
   
   4.0.0
 

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Sep 10 12:06:00 
2012
@@ -21,7 +21,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.0
+2.1-SNAPSHOT
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Mon Sep 10 12:06:00 
2012
@@ -23,7 +23,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.0
+2.1-SNAPSHOT
   
   tomcat7-maven-plugin
   maven-plugin

Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml?rev=1382786&r1=1382785&r2=1382786&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml Mon Sep 1

[jira] [Updated] (MTOMCAT-158) WAR Overlay Does Not Include Resources

[*$^¨%`£]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-158?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy (*$^¨%`£) updated MTOMCAT-158:
---

Fix Version/s: 2.1

> WAR Overlay Does Not Include Resources
> --
>
> Key: MTOMCAT-158
> URL: https://issues.apache.org/jira/browse/MTOMCAT-158
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat6, tomcat7
>Affects Versions: 2.0
>Reporter: Robert Hollencamp
>Assignee: Olivier Lamy (*$^¨%`£)
> Fix For: 2.1
>
> Attachments: MTOMCAT-158-1.diff
>
>
> When running tomcat[67]:run on a web application that includes WAR overlays, 
> static resources in those WAR overlays are not seen by the spawned tomcat 
> server.
> Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin) 
> and CLASS files are added to the classpath.
> WAR overlays can also contain static resources, like JSP, CSS, JS, etc. 
> Tomcat needs to be aware of these resources

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
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: r1382796 - /tomcat/maven-plugin/trunk/pom.xml

[olamy]

Author: olamy
Date: Mon Sep 10 12:31:50 2012
New Revision: 1382796

URL: http://svn.apache.org/viewvc?rev=1382796&view=rev
Log:
remove plugins we have reports in analysis.apache.org

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

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1382796&r1=1382795&r2=1382796&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Sep 10 12:31:50 2012
@@ -748,7 +748,7 @@
   
 org.apache.maven.plugins
 maven-project-info-reports-plugin
-2.4
+2.5.1
 
   true
 
@@ -815,21 +815,11 @@
 
   
   
-org.codehaus.mojo
-cobertura-maven-plugin
-2.5.1
-  
-  
 org.apache.maven.plugins
 maven-jxr-plugin
 2.2
   
   
-org.codehaus.mojo
-findbugs-maven-plugin
-2.5.1
-  
-  
 org.codehaus.sonar-plugins
 maven-report
 0.1



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

svn commit: r833 - in /dev/tomcat/maven-plugin: ./ v2.0/

[olamy]

Author: olamy
Date: Mon Sep 10 12:36:30 2012
New Revision: 833

Log:
add maven-plugin 2.0 for vote

Added:
dev/tomcat/maven-plugin/
dev/tomcat/maven-plugin/v2.0/
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip   
(with props)
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1

Added: dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc
==
--- dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc 
(added)
+++ dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.12 (Darwin)
+
+iEYEABECAAYFAlBN198ACgkQhzqOhrQ3IUYFOACcDWgE4JdlbRPRSAuWLi1ViekP
+ZMAAnjr5aFUigJcGDqgjW496AelywFAK
+=RvUe
+-END PGP SIGNATURE-

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5
==
--- dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5 
(added)
+++ dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1 @@
+bb63da59e11aa1caf4dc72ad5f072899
\ No newline at end of file

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1
==
--- 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1 
(added)
+++ 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1 @@
+856790126c8310a434932b3d909d7f902ad69701
\ No newline at end of file



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

svn commit: r833 - in /dev/tomcat/maven-plugin: ./ v2.0/

[olamy]

Author: olamy
Date: Mon Sep 10 12:36:30 2012
New Revision: 833

Log:
add maven-plugin 2.0 for vote

Added:
dev/tomcat/maven-plugin/
dev/tomcat/maven-plugin/v2.0/
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip   
(with props)
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1

Added: dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc
==
--- dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc 
(added)
+++ dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.asc 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.12 (Darwin)
+
+iEYEABECAAYFAlBN198ACgkQhzqOhrQ3IUYFOACcDWgE4JdlbRPRSAuWLi1ViekP
+ZMAAnjr5aFUigJcGDqgjW496AelywFAK
+=RvUe
+-END PGP SIGNATURE-

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5
==
--- dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5 
(added)
+++ dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.md5 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1 @@
+bb63da59e11aa1caf4dc72ad5f072899
\ No newline at end of file

Added: 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1
==
--- 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1 
(added)
+++ 
dev/tomcat/maven-plugin/v2.0/tomcat-maven-plugin-2.0-source-release.zip.sha1 
Mon Sep 10 12:36:30 2012
@@ -0,0 +1 @@
+856790126c8310a434932b3d909d7f902ad69701
\ No newline at end of file



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

[VOTE] Apache Tomcat Maven Plugin 2.0

[Olivier Lamy]

Hi,
I'd like to release Apache Tomcat Maven Plugin 2.0.
We fixed 41 issues (see details http://s.apache.org/TOMCAT-MVN-2.0 ).
Staging Maven repository:
https://repository.apache.org/content/repositories/orgapachetomcat-045/
Sources release (as we distribute artifacts tru sync with Maven
central) sources are distributed separately:
https://dist.apache.org/repos/dist/dev/tomcat/maven-plugin/v2.0/
Site documentation: http://tomcat.apache.org/maven-plugin-2.0 (wait sync)

Vote open for 72H
[+1]
[0]
[-1]

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

[Bug 53847] High CPU usage in tomcat native 1.22+

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Mark Thomas  ---
This report is close to useless at the moment. It is a long way from providing
the Tomcat developers with sufficient information to identify the root cause of
the issue.

As a minimum, the following is required to progress this:
- testing against at least the latest stable 6.0.x release and ideally
6.0.x/trunk
- testing with at least APR/native 1.1.24 and ideally APR/native 1.1.x trunk
- OpenSSL version used
- three thread dumps taken ~10s apart when the 100% CPU usage occurs

A better idea of what triggers this would also help.

-- 
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: r1382832 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ webapps/manager/WEB-INF/

[markt]

Author: markt
Date: Mon Sep 10 13:36:12 2012
New Revision: 1382832

URL: http://svn.apache.org/viewvc?rev=1382832&view=rev
Log:
Make sessions in the session Store visible via the Manager web application if 
showProxySessions is enabled

Modified:
tomcat/trunk/java/org/apache/catalina/DistributedManager.java
tomcat/trunk/java/org/apache/catalina/StoreManager.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/trunk/java/org/apache/catalina/DistributedManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/DistributedManager.java?rev=1382832&r1=1382831&r2=1382832&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/DistributedManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/DistributedManager.java Mon Sep 10 
13:36:12 2012
@@ -21,11 +21,17 @@ import java.util.Set;
 
 /**
  * Interface implemented by session managers that do not keep a complete copy
- * of all sessions on the local node but do know where every session is. The
- * BackupManager is an example of such a Manager. Sessions can be primary
- * (master copy on this node), backup (backup copy on this node) or proxy (only
- * the session ID on this node). The identity of the primary and backup nodes
- * are known for all sessions, including proxy sessions.
+ * of all sessions in memory but do know where every session is. The
+ * BackupManager is an example of such a Manager as are implementations of the
+ * StoreManager interface.
+ * 
+ * With the BackupManager, sessions can be primary (master copy on this node),
+ * backup (backup copy on this node) or proxy (only the session ID on this
+ * node). The identity of the primary and backup nodes are known for all
+ * sessions, including proxy sessions.
+ * 
+ * With StoreManager implementations, sessions can be primary (session is in
+ * memory) or proxy (session is in the Store).
  */
 public interface DistributedManager {
 

Modified: tomcat/trunk/java/org/apache/catalina/StoreManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/StoreManager.java?rev=1382832&r1=1382831&r2=1382832&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/StoreManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/StoreManager.java Mon Sep 10 13:36:12 
2012
@@ -20,7 +20,7 @@ package org.apache.catalina;
  * PersistentManager would have been a better name but that would have clashed
  * with the implementation name.
  */
-public interface StoreManager {
+public interface StoreManager extends DistributedManager {
 
 /**
  * Return the Store object which manages persistent Session

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1382832&r1=1382831&r2=1382832&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Mon 
Sep 10 13:36:12 2012
@@ -69,4 +69,6 @@ persistentManager.tooManyActive=Too many
 persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} 
seconds too many sessions active
 persistentManager.swapIn=Swapping session {0} in from Store
 persistentManager.swapInException=Exception in the Store during swapIn: {0}
-persistentManager.swapInInvalid=Swapped session {0} is invalid
\ No newline at end of file
+persistentManager.swapInInvalid=Swapped session {0} is invalid
+persistentManager.storeKeysException=Unable to determine the list of session 
IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeSizeException=Unable to determine the number of 
sessions in the session store, assuming that the store is empty
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1382832&r1=1382831&r2=1382832&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java 
Mon Sep 10 13:36:12 2012
@@ -23,7 +23,9 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.cata

svn commit: r1382837 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ webapps/docs/ webapps/manager/WEB-INF/

[markt]

Author: markt
Date: Mon Sep 10 13:43:41 2012
New Revision: 1382837

URL: http://svn.apache.org/viewvc?rev=1382837&view=rev
Log:
Make sessions in the session Store visible via the Manager web application if 
showProxySessions is enabled

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1382832

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java?rev=1382837&r1=1382836&r2=1382837&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/DistributedManager.java Mon 
Sep 10 13:43:41 2012
@@ -21,11 +21,17 @@ import java.util.Set;
 
 /**
  * Interface implemented by session managers that do not keep a complete copy
- * of all sessions on the local node but do know where every session is. The
- * BackupManager is an example of such a Manager. Sessions can be primary
- * (master copy on this node), backup (backup copy on this node) or proxy (only
- * the session ID on this node). The identity of the primary and backup nodes
- * are known for all sessions, including proxy sessions.
+ * of all sessions in memory but do know where every session is. The
+ * BackupManager is an example of such a Manager as are implementations of the
+ * StoreManager interface.
+ * 
+ * With the BackupManager, sessions can be primary (master copy on this node),
+ * backup (backup copy on this node) or proxy (only the session ID on this
+ * node). The identity of the primary and backup nodes are known for all
+ * sessions, including proxy sessions.
+ * 
+ * With StoreManager implementations, sessions can be primary (session is in
+ * memory) or proxy (session is in the Store).
  */
 public interface DistributedManager {
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1382837&r1=1382836&r2=1382837&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties 
Mon Sep 10 13:43:41 2012
@@ -80,4 +80,6 @@ persistentManager.processSwaps=Checking 
 persistentManager.activeSession=Session {0} has been idle for {1} seconds
 persistentManager.swapIn=Swapping session {0} in from Store
 persistentManager.swapInException=Exception in the Store during swapIn: {0}
-persistentManager.swapInInvalid=Swapped session {0} is invalid
\ No newline at end of file
+persistentManager.swapInInvalid=Swapped session {0} is invalid
+persistentManager.storeKeysException=Unable to determine the list of session 
IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeSizeException=Unable to determine the number of 
sessions in the session store, assuming that the store is empty
\ No newline at end of file

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1382837&r1=1382836&r2=1382837&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
 Mon Sep 10 13:43:41 2012
@@ -23,8 +23,11 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
+import org.apache.catalina.DistributedManager;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
@@ -47,7 +50,8 @@ import org.apache.juli.logging.LogFactor
  * @version $Id$
  */
 
-public abstract class PersistentManagerBase extends ManagerBase {
+public abstract class PersistentManagerBase extends ManagerBase
+implements DistributedManager {
 
 private static final Log log = 
LogFactory.getLog(PersistentManagerBa

svn commit: r1382842 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Mon Sep 10 13:49:03 2012
New Revision: 1382842

URL: http://svn.apache.org/viewvc?rev=1382842&view=rev
Log:
Take account of clusters and persistent session managers when checking if all 
sessions have expired.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1382842&r1=1382841&r2=1382842&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Sep 10 
13:49:03 2012
@@ -47,6 +47,7 @@ import javax.management.ObjectName;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.DistributedManager;
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
@@ -1429,21 +1430,31 @@ public class HostConfig
 currentContext.getState().isAvailable() &&
 !isServiced(previous.getName())) {
 Manager manager = previousContext.getManager();
-if (manager != null && manager.getActiveSessions() == 0) {
-if (log.isInfoEnabled()) {
-log.info(sm.getString("hostConfig.undeployVersion",
-previous.getName()));
+if (manager != null) {
+int sessionCount;
+if (manager instanceof DistributedManager) {
+sessionCount = ((DistributedManager)
+manager).getActiveSessionsFull();
+} else {
+sessionCount = manager.getActiveSessions();
+}
+if (sessionCount == 0) {
+if (log.isInfoEnabled()) {
+log.info(sm.getString(
+"hostConfig.undeployVersion",
+previous.getName()));
+}
+DeployedApplication app =
+deployed.get(previous.getName());
+String[] resources =
+app.redeployResources.keySet().toArray(
+new String[0]);
+// Version is unused - undeploy it completely
+// The -1 is a 'trick' to ensure all redeploy
+// resources are removed
+deleteRedeployResources(app, resources, -1,
+true);
 }
-DeployedApplication app =
-deployed.get(previous.getName());
-String[] resources =
-app.redeployResources.keySet().toArray(
-new String[0]);
-// Version is unused - undeploy it completely
-// The -1 is a 'trick' to ensure all redeploy resources
-// are removed
-deleteRedeployResources(app, resources, -1,
-true);
 }
 }
 }



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

svn commit: r1382845 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Mon Sep 10 13:51:15 2012
New Revision: 1382845

URL: http://svn.apache.org/viewvc?rev=1382845&view=rev
Log:
Take account of clusters and persistent session managers when checking if all 
sessions have expired.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1382842

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1382845&r1=1382844&r2=1382845&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon 
Sep 10 13:51:15 2012
@@ -48,6 +48,7 @@ import javax.management.ObjectName;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.DistributedManager;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
@@ -1482,21 +1483,31 @@ public class HostConfig
 currentContext.getState().isAvailable() &&
 !isServiced(previous.getName())) {
 Manager manager = previousContext.getManager();
-if (manager != null && manager.getActiveSessions() == 0) {
-if (log.isInfoEnabled()) {
-log.info(sm.getString("hostConfig.undeployVersion",
-previous.getName()));
+if (manager != null) {
+int sessionCount;
+if (manager instanceof DistributedManager) {
+sessionCount = ((DistributedManager)
+manager).getActiveSessionsFull();
+} else {
+sessionCount = manager.getActiveSessions();
+}
+if (sessionCount == 0) {
+if (log.isInfoEnabled()) {
+log.info(sm.getString(
+"hostConfig.undeployVersion",
+previous.getName()));
+}
+DeployedApplication app =
+deployed.get(previous.getName());
+String[] resources =
+app.redeployResources.keySet().toArray(
+new String[0]);
+// Version is unused - undeploy it completely
+// The -1 is a 'trick' to ensure all redeploy
+// resources are removed
+deleteRedeployResources(app, resources, -1,
+true);
 }
-DeployedApplication app =
-deployed.get(previous.getName());
-String[] resources =
-app.redeployResources.keySet().toArray(
-new String[0]);
-// Version is unused - undeploy it completely
-// The -1 is a 'trick' to ensure all redeploy resources
-// are removed
-deleteRedeployResources(app, resources, -1,
-true);
 }
 }
 }



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

svn commit: r1382850 - in /tomcat/sandbox/trunk-resources: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/startup/ webapps/manager/WEB-INF/

[markt]

Author: markt
Date: Mon Sep 10 13:56:41 2012
New Revision: 1382850

URL: http://svn.apache.org/viewvc?rev=1382850&view=rev
Log:
Merge changes from trunk

Modified:
tomcat/sandbox/trunk-resources/   (props changed)

tomcat/sandbox/trunk-resources/java/org/apache/catalina/DistributedManager.java
tomcat/sandbox/trunk-resources/java/org/apache/catalina/StoreManager.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/LocalStrings.properties

tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/PersistentManagerBase.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/HostConfig.java
tomcat/sandbox/trunk-resources/webapps/manager/WEB-INF/web.xml

Propchange: tomcat/sandbox/trunk-resources/
--
svn:mergeinfo = /tomcat/trunk:1382517-1382847

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/DistributedManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/DistributedManager.java?rev=1382850&r1=1382849&r2=1382850&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/DistributedManager.java 
(original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/DistributedManager.java 
Mon Sep 10 13:56:41 2012
@@ -21,11 +21,17 @@ import java.util.Set;
 
 /**
  * Interface implemented by session managers that do not keep a complete copy
- * of all sessions on the local node but do know where every session is. The
- * BackupManager is an example of such a Manager. Sessions can be primary
- * (master copy on this node), backup (backup copy on this node) or proxy (only
- * the session ID on this node). The identity of the primary and backup nodes
- * are known for all sessions, including proxy sessions.
+ * of all sessions in memory but do know where every session is. The
+ * BackupManager is an example of such a Manager as are implementations of the
+ * StoreManager interface.
+ * 
+ * With the BackupManager, sessions can be primary (master copy on this node),
+ * backup (backup copy on this node) or proxy (only the session ID on this
+ * node). The identity of the primary and backup nodes are known for all
+ * sessions, including proxy sessions.
+ * 
+ * With StoreManager implementations, sessions can be primary (session is in
+ * memory) or proxy (session is in the Store).
  */
 public interface DistributedManager {
 

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/StoreManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/StoreManager.java?rev=1382850&r1=1382849&r2=1382850&view=diff
==
--- tomcat/sandbox/trunk-resources/java/org/apache/catalina/StoreManager.java 
(original)
+++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/StoreManager.java 
Mon Sep 10 13:56:41 2012
@@ -20,7 +20,7 @@ package org.apache.catalina;
  * PersistentManager would have been a better name but that would have clashed
  * with the implementation name.
  */
-public interface StoreManager {
+public interface StoreManager extends DistributedManager {
 
 /**
  * Return the Store object which manages persistent Session

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/LocalStrings.properties?rev=1382850&r1=1382849&r2=1382850&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/LocalStrings.properties
 (original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/LocalStrings.properties
 Mon Sep 10 13:56:41 2012
@@ -69,4 +69,6 @@ persistentManager.tooManyActive=Too many
 persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} 
seconds too many sessions active
 persistentManager.swapIn=Swapping session {0} in from Store
 persistentManager.swapInException=Exception in the Store during swapIn: {0}
-persistentManager.swapInInvalid=Swapped session {0} is invalid
\ No newline at end of file
+persistentManager.swapInInvalid=Swapped session {0} is invalid
+persistentManager.storeKeysException=Unable to determine the list of session 
IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeSizeException=Unable to determine the number of 
sessions in the session store, assuming that the store is empty
\ No newline at end of file

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1382850

svn commit: r1382855 - /tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java

[markt]

Author: markt
Date: Mon Sep 10 14:01:08 2012
New Revision: 1382855

URL: http://svn.apache.org/viewvc?rev=1382855&view=rev
Log:
Need to handle trailing slash being present and not present

Modified:

tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java?rev=1382855&r1=1382854&r2=1382855&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java
 Mon Sep 10 14:01:08 2012
@@ -89,7 +89,11 @@ public class DirResourceSet implements W
 String[] list = f.list();
 if (list != null) {
 for (String entry : list) {
-result.add(path + entry);
+if (path.charAt(path.length() - 1) == '/') {
+result.add(path + entry);
+} else {
+result.add(path + "/" + entry);
+}
 }
 }
 }



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

Re: Resources - JarScanner / WebappClassLoader

[Mark Thomas]

On 09/09/2012 20:01, Mark Thomas wrote:
> This is issue d) in Konstantin's comments in TOMCAT-NEXT.txt
> 
> Konstantin is right to point out the inefficiencies in JarScanner. There
> is no need to scan WEB-INF/lib and WEB-INF/classes as the class path
> from the WebappClassLoader already includes them.
> 
> However, I think this can be considered separately from the Resources
> implementation. My suggestion is to open a BZ enhancement request for this.
> 
> My one comment is that we'll need to be careful to retain the current
> functionality of having the option to scan just WEB-INF or the entire
> class path.

Time for plan B. Already :)

The Virtual[Loader|DirContext] unit tests are proving very useful at
ferreting out edge cases. The JarScanner currently depends on a
consistent URL space under WEB-INF/classes which is no longer the case.

Fixing the consistent URL space issue with the JarScanner is an ideal
opportunity to address the above issue as well. I'll patch trunk and
then port to 7.0.x and the sandbox.

Mark

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

Re: [VOTE] Apache Tomcat Maven Plugin 2.0

[Henri Gomez]

+1

Works for me

2012/9/10 Olivier Lamy :
> Hi,
> I'd like to release Apache Tomcat Maven Plugin 2.0.
> We fixed 41 issues (see details http://s.apache.org/TOMCAT-MVN-2.0 ).
> Staging Maven repository:
> https://repository.apache.org/content/repositories/orgapachetomcat-045/
> Sources release (as we distribute artifacts tru sync with Maven
> central) sources are distributed separately:
> https://dist.apache.org/repos/dist/dev/tomcat/maven-plugin/v2.0/
> Site documentation: http://tomcat.apache.org/maven-plugin-2.0 (wait sync)
>
> Vote open for 72H
> [+1]
> [0]
> [-1]
>
> Thanks,
> --
> 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
>

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

svn commit: r1382972 - /tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java

[markt]

Author: markt
Date: Mon Sep 10 16:32:43 2012
New Revision: 1382972

URL: http://svn.apache.org/viewvc?rev=1382972&view=rev
Log:
Migrate test to new Resources implementation

Modified:

tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java

Modified: 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1382972&r1=1382971&r2=1382972&view=diff
==
--- 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
 Mon Sep 10 16:32:43 2012
@@ -24,10 +24,11 @@ import static org.junit.Assert.assertNul
 
 import org.junit.Test;
 
+import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.naming.resources.FileDirContext;
+import org.apache.catalina.webresources.StandardRoot;
 
 public class TestVirtualWebappLoader extends TomcatBaseTest {
 
@@ -46,25 +47,30 @@ public class TestVirtualWebappLoader ext
 StandardContext ctx =
 (StandardContext)tomcat.addContext("",  appDir.getAbsolutePath());
 
-VirtualWebappLoader loader = new VirtualWebappLoader();
+
+WebappLoader loader = new WebappLoader();
 
 loader.setContext(ctx);
 ctx.setLoader(loader);
-ctx.setResources(new FileDirContext());
+
+ctx.setResources(new StandardRoot(ctx));
 ctx.resourcesStart();
-File dir = new File("test/webapp-3.0-fragments/WEB-INF/lib");
-loader.setVirtualClasspath(dir.getAbsolutePath() + "/*.jar");
+
+File f1 = new File("test/webapp-3.0-fragments/WEB-INF/lib");
+ctx.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, f1, "/WEB-INF/lib", "");
+
 loader.start();
-String[] repos = loader.getRepositories();
+String[] repos = loader.getLoaderRepositories();
 assertEquals(2,repos.length);
 loader.stop();
 // ToDo: Why doesn't remove repositories?
-repos = loader.getRepositories();
+repos = loader.getLoaderRepositories();
 assertEquals(2, repos.length);
 
 // no leak
 loader.start();
-repos = loader.getRepositories();
+repos = loader.getLoaderRepositories();
 assertEquals(2,repos.length);
 
 // clear loader



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

Re: Resources - JarScanner / WebappClassLoader

[Mark Thomas]

On 10/09/2012 15:11, Mark Thomas wrote:
> On 09/09/2012 20:01, Mark Thomas wrote:
>> This is issue d) in Konstantin's comments in TOMCAT-NEXT.txt
>>
>> Konstantin is right to point out the inefficiencies in JarScanner. There
>> is no need to scan WEB-INF/lib and WEB-INF/classes as the class path
>> from the WebappClassLoader already includes them.
>>
>> However, I think this can be considered separately from the Resources
>> implementation. My suggestion is to open a BZ enhancement request for this.
>>
>> My one comment is that we'll need to be careful to retain the current
>> functionality of having the option to scan just WEB-INF or the entire
>> class path.
> 
> Time for plan B. Already :)
> 
> The Virtual[Loader|DirContext] unit tests are proving very useful at
> ferreting out edge cases. The JarScanner currently depends on a
> consistent URL space under WEB-INF/classes which is no longer the case.
> 
> Fixing the consistent URL space issue with the JarScanner is an ideal
> opportunity to address the above issue as well. I'll patch trunk and
> then port to 7.0.x and the sandbox.

The edge cases mean the fix for trunk and trunk-resources is turning out
to be very different. I'm going to focus on trunk-resources.

Mark


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

svn commit: r1383027 - in /tomcat/sandbox/trunk-resources/java/org/apache/catalina: Context.java WebResourceRoot.java core/StandardContext.java startup/FailedContext.java webresources/DirResourceSet.j

[markt]

Author: markt
Date: Mon Sep 10 18:33:21 2012
New Revision: 1383027

URL: http://svn.apache.org/viewvc?rev=1383027&view=rev
Log:
Make processing /WEB-INF/classes/META-INF/resources consistent and drive by 
Context setting.

Modified:
tomcat/sandbox/trunk-resources/java/org/apache/catalina/Context.java
tomcat/sandbox/trunk-resources/java/org/apache/catalina/WebResourceRoot.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/FailedContext.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/StandardRoot.java

Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/Context.java?rev=1383027&r1=1383026&r2=1383027&view=diff
==
--- tomcat/sandbox/trunk-resources/java/org/apache/catalina/Context.java 
(original)
+++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/Context.java Mon 
Sep 10 18:33:21 2012
@@ -1410,5 +1410,21 @@ public interface Context extends Contain
  * @param manager The newly associated Manager
  */
 public void setManager(Manager manager);
+
+/**
+ * Sets the flag that indicates if /WEB-INF/classes should be treated like
+ * an exploded JAR and JAR resources made available as if they were in a
+ * JAR.
+ *
+ * @param addWebinfClassesResources The new value for the flag
+ */
+public void setAddWebinfClassesResources(boolean 
addWebinfClassesResources);
+
+/**
+ * Gets the flag that indicates if /WEB-INF/classes should be treated like
+ * an exploded JAR and JAR resources made available as if they were in a
+ * JAR.
+ */
+public boolean getAddWebinfClassesResources();
 }
 

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/WebResourceRoot.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/WebResourceRoot.java?rev=1383027&r1=1383026&r2=1383027&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/WebResourceRoot.java 
(original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/WebResourceRoot.java 
Mon Sep 10 18:33:21 2012
@@ -215,6 +215,12 @@ public interface WebResourceRoot extends
 void createWebResourceSet(ResourceSetType type, File file,
 String webAppMount, String internalPath);
 
+/**
+ *
+ * @return
+ */
+boolean getAddWebinfClassesResources();
+
 void setAllowLinking(boolean allowLinking);
 
 public static enum ResourceSetType {

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java?rev=1383027&r1=1383026&r2=1383027&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java
 Mon Sep 10 18:33:21 2012
@@ -861,12 +861,14 @@ public class StandardContext extends Con
 }
 
 
+@Override
 public void setAddWebinfClassesResources(
 boolean addWebinfClassesResources) {
 this.addWebinfClassesResources = addWebinfClassesResources;
 }
 
 
+@Override
 public boolean getAddWebinfClassesResources() {
 return addWebinfClassesResources;
 }

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/FailedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/FailedContext.java?rev=1383027&r1=1383026&r2=1383027&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/FailedContext.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/FailedContext.java
 Mon Sep 10 18:33:21 2012
@@ -673,4 +673,11 @@ public class FailedContext extends Lifec
 
 @Override
 public File getCatalinaBase() { return null; }
+
+@Override
+public void setAddWebinfClassesResources(boolean 
addWebinfClassesResources) {
+// NO-OP
+}
+@Override
+public boolean getAddWebinfClassesResources() { return false; }
 }
\ No newline at end of file

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/webresources/DirResourceSet.java?rev=1383027&r1=1383026&

svn commit: r1383049 - in /tomcat/sandbox/trunk-resources/java/org/apache: catalina/startup/ jasper/compiler/ tomcat/ tomcat/util/scan/

[markt]

Author: markt
Date: Mon Sep 10 19:03:46 2012
New Revision: 1383049

URL: http://svn.apache.org/viewvc?rev=1383049&view=rev
Log:
Modifications to JarScanner to:
 - Stop 'double scanning' WEB-INF
 - Correctly scan WEB-INF classes for with new Resources implementation

Modified:

tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/ContextConfig.java

tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/TldConfig.java

tomcat/sandbox/trunk-resources/java/org/apache/jasper/compiler/TldLocationsCache.java

tomcat/sandbox/trunk-resources/java/org/apache/tomcat/JarScannerCallback.java

tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/scan/LocalStrings.properties

tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/scan/StandardJarScanner.java

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/ContextConfig.java?rev=1383049&r1=1383048&r2=1383049&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/ContextConfig.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/ContextConfig.java
 Mon Sep 10 19:03:46 2012
@@ -2525,6 +2525,14 @@ for (String interfaceName : cacheEntry.g
 }
 }
 
+
+@Override
+public void scanWebInfClasses() {
+// NO-OP. Fragments unpacked in WEB-INF classes are not handled,
+// mainly because if there are multiple fragments there is no way 
to
+// handle multiple web-fragment.xml files.
+}
+
 public Map getFragments() {
 return fragments;
 }

Modified: 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/TldConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/TldConfig.java?rev=1383049&r1=1383048&r2=1383049&view=diff
==
--- 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/TldConfig.java 
(original)
+++ 
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/TldConfig.java 
Mon Sep 10 19:03:46 2012
@@ -59,8 +59,10 @@ public final class TldConfig  implements
 
 private static final String TLD_EXT = ".tld";
 private static final String WEB_INF = "/WEB-INF/";
+private static final String WEB_INF_CLASSES = "/WEB-INF/classes/";
 private static final String WEB_INF_LIB = "/WEB-INF/lib/";
 
+
 // Names of JARs that are known not to contain any TLDs
 private static volatile Set noTldJars = null;
 
@@ -255,7 +257,7 @@ public final class TldConfig  implements
 tldScanWebXml();
 
 // Stage 3a - TLDs under WEB-INF (not lib or classes)
-tldScanResourcePaths(WEB_INF);
+tldScanResourcePaths(WEB_INF, false);
 
 // Stages 3b & 4
 JarScanner jarScanner = context.getJarScanner();
@@ -295,6 +297,11 @@ public final class TldConfig  implements
 tldScanDir(metaInf);
 }
 }
+
+@Override
+public void scanWebInfClasses() throws IOException {
+tldScanResourcePaths(WEB_INF_CLASSES, true);
+}
 }
 
 //  Private Methods
@@ -363,11 +370,12 @@ public final class TldConfig  implements
  *
  * Initially, rootPath equals /WEB-INF/. The /WEB-INF/classes and
  * /WEB-INF/lib sub-directories are excluded from the search, as per the
- * JSP 2.0 spec.
+ * JSP 2.0 spec unless the JarScanner is configured to treat
+ * /WEB-INF/classes/ as an exploded JAR.
  *
  * Keep in sync with o.a.j.comiler.TldLocationsCache
  */
-private void tldScanResourcePaths(String startPath) {
+private void tldScanResourcePaths(String startPath, boolean webInfAsJar) {
 
 if (log.isTraceEnabled()) {
 log.trace(sm.getString("tldConfig.webinfScan", startPath));
@@ -382,7 +390,8 @@ public final class TldConfig  implements
 String path = it.next();
 if (!path.endsWith(TLD_EXT)
 && (path.startsWith(WEB_INF_LIB)
-|| path.startsWith("/WEB-INF/classes/"))) {
+|| path.startsWith("/WEB-INF/classes/")
+   && !webInfAsJar)) {
 continue;
 }
 if (path.endsWith(TLD_EXT)) {
@@ -407,7 +416,7 @@ public final class TldConfig  implements
 }
 }
 } else {
-tldScanResourcePaths(path);
+tldScanResourcePaths(path, false);
 }
 }
 }

Modified: 
tomcat/sandbox/trunk-resources/java/o

svn commit: r1383050 - /tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java

[markt]

Author: markt
Date: Mon Sep 10 19:04:21 2012
New Revision: 1383050

URL: http://svn.apache.org/viewvc?rev=1383050&view=rev
Log:
Test expects WEB-INF/classes to be treated as an exploded JAR.

Modified:

tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java

Modified: 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1383050&r1=1383049&r2=1383050&view=diff
==
--- 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java
 (original)
+++ 
tomcat/sandbox/trunk-resources/test/org/apache/catalina/loader/TestVirtualContext.java
 Mon Sep 10 19:04:21 2012
@@ -92,6 +92,7 @@ public class TestVirtualContext extends 
 StandardJarScanner jarScanner = new StandardJarScanner();
 jarScanner.setScanAllDirectories(true);
 ctx.setJarScanner(jarScanner);
+ctx.setAddWebinfClassesResources(true);
 
 tomcat.start();
 



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

Re: Resources - JarScanner / WebappClassLoader

[Mark Thomas]

On 10/09/2012 17:34, Mark Thomas wrote:
> On 10/09/2012 15:11, Mark Thomas wrote:
>> On 09/09/2012 20:01, Mark Thomas wrote:
>>> This is issue d) in Konstantin's comments in TOMCAT-NEXT.txt
>>>
>>> Konstantin is right to point out the inefficiencies in JarScanner. There
>>> is no need to scan WEB-INF/lib and WEB-INF/classes as the class path
>>> from the WebappClassLoader already includes them.
>>>
>>> However, I think this can be considered separately from the Resources
>>> implementation. My suggestion is to open a BZ enhancement request for this.
>>>
>>> My one comment is that we'll need to be careful to retain the current
>>> functionality of having the option to scan just WEB-INF or the entire
>>> class path.
>>
>> Time for plan B. Already :)
>>
>> The Virtual[Loader|DirContext] unit tests are proving very useful at
>> ferreting out edge cases. The JarScanner currently depends on a
>> consistent URL space under WEB-INF/classes which is no longer the case.
>>
>> Fixing the consistent URL space issue with the JarScanner is an ideal
>> opportunity to address the above issue as well. I'll patch trunk and
>> then port to 7.0.x and the sandbox.
> 
> The edge cases mean the fix for trunk and trunk-resources is turning out
> to be very different. I'm going to focus on trunk-resources.

This is complete for trunk-resources.

I don't intend addressing it in trunk as a different solution would be
required. Neither do I intend addressing it in 7.0.x. On this basis, I
believe this issue is now resolved.

Mark


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