Re: Tagging 10.1.0-M5 etc
On Tue, Aug 31, 2021 at 8:02 PM Mark Thomas wrote: Hi all, Things are looking good for the September release. We do need the Tomcat Native 1.2.31 vote to complete first (thanks for your vote Rémy). If you have time to test with 1.2.31 your vote would be really helpful as we only have 2 votes so far. Assuming 1.2.31 passes, I'll complete the release then update the Tomcat branches, test and then tag. If everything goes well, we should have release votes running by the end of the week and hopefully a little sooner. Sorry all. Two things caused a delay. 1. The Commons DBCP and Pool updates took a lot longer than I expected due to the large number of changes. 2. When I ran the unit tests on Mac OS I had a failure in the TLS tests. It took me a while to track down the root cause to a stray copy of the Tomcat test CA cert in the OpenSSL default cert list that meant a client cert was accepted (since OpenSSL recognised the CA) when it should have been rejected. I'm now expecting to re-test and tag first thing next week. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65548] Webapp context not loaded after calling addServiced, check and removeServiced calls
https://bz.apache.org/bugzilla/show_bug.cgi?id=65548
Mark Thomas changed:
What|Removed |Added
Status|NEW |NEEDINFO
--- Comment #1 from Mark Thomas ---
What happens if you just call:
check("sample")
without any calls to addServiced(), removeServiced(), tryAddServiced() etc?
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: jarsToSkip += derby-*.jar
On 03/09/2021 15:02, Rémy Maucherat wrote: On Fri, Sep 3, 2021 at 10:03 AM wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e9cbd4c jarsToSkip += derby-*.jar e9cbd4c is described below commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6 Author: Mark Thomas AuthorDate: Fri Sep 3 09:02:05 2021 +0100 jarsToSkip += derby-*.jar Thanks, I always keep forgetting that ... No worries. I only noticed it because I happened to see the stack traces related to the failed scan. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix docs inconsistencies
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new cf29253 Fix docs inconsistencies cf29253 is described below commit cf29253074d82c954a96cf3d75df56f256f94e8e Author: remm AuthorDate: Fri Sep 3 16:19:18 2021 +0200 Fix docs inconsistencies --- webapps/docs/config/realm.xml | 3 +++ webapps/docs/realm-howto.xml | 20 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index 4f6569e..51f586d 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -670,6 +670,9 @@ This allows using a static Principal instance disconnected from the database if needed. This makes the bahavior of authenticated prinicipals equivalent to that of the other realms. +If there is a plan to use serialization, it is best to set this to +true as the principal will always be replaced by this +equivalent static principal when serializing. If not specified, the default is false: use a Principal connected to the UserDatabase. diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml index 2a358a8..5c68644 100644 --- a/webapps/docs/realm-howto.xml +++ b/webapps/docs/realm-howto.xml @@ -811,8 +811,8 @@ configuration documentation. User File Format -The users file uses the same format as the -MemoryRealm. +For the XML file based UserDatabase, the users file uses the +same format as the MemoryRealm. Example @@ -838,12 +838,20 @@ to all virtual hosts and web applications. The default contents of the When a user attempts to access a protected resource for the first time, Tomcat will call the authenticate() method of this Realm. -Once a user has been authenticated, the user (and their associated -roles) are cached within Tomcat for the duration of the user's login. +Once a user has been authenticated, the user becomes associated within +Tomcat for the duration of the user's login. (For FORM-based authentication, that means until the session times out or is invalidated; for BASIC authentication, that means until the user -closes their browser). The cached user is not saved and -restored across sessions serialisations. +closes their browser). However, the user roles will still reflect the +UserDatabase contents, unlike for the other realms. If a user +is removed from the database, it will be considered to have no roles. +The useStaticPrincipal attribute of the +UserDatabaseRealm can be used to instead cache the user along +with all its roles. The cached user is not saved and +restored across sessions serialisations. When the user's principal object +is serialized for any reason, it will also be replaced by a static +equivalent object with roles that will no longer reflect the databse +contents. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix docs inconsistencies
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 312b8b7 Fix docs inconsistencies 312b8b7 is described below commit 312b8b7c648ceb9851c1afe0e2a2cd93c99dc391 Author: remm AuthorDate: Fri Sep 3 16:19:18 2021 +0200 Fix docs inconsistencies --- webapps/docs/config/realm.xml | 3 +++ webapps/docs/realm-howto.xml | 20 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index 32c28b0..76e00ef 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -670,6 +670,9 @@ This allows using a static Principal instance disconnected from the database if needed. This makes the bahavior of authenticated prinicipals equivalent to that of the other realms. +If there is a plan to use serialization, it is best to set this to +true as the principal will always be replaced by this +equivalent static principal when serializing. If not specified, the default is false: use a Principal connected to the UserDatabase. diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml index 9f19c6d..d03291c 100644 --- a/webapps/docs/realm-howto.xml +++ b/webapps/docs/realm-howto.xml @@ -809,8 +809,8 @@ configuration documentation. User File Format -The users file uses the same format as the -MemoryRealm. +For the XML file based UserDatabase, the users file uses the +same format as the MemoryRealm. Example @@ -836,12 +836,20 @@ to all virtual hosts and web applications. The default contents of the When a user attempts to access a protected resource for the first time, Tomcat will call the authenticate() method of this Realm. -Once a user has been authenticated, the user (and their associated -roles) are cached within Tomcat for the duration of the user's login. +Once a user has been authenticated, the user becomes associated within +Tomcat for the duration of the user's login. (For FORM-based authentication, that means until the session times out or is invalidated; for BASIC authentication, that means until the user -closes their browser). The cached user is not saved and -restored across sessions serialisations. +closes their browser). However, the user roles will still reflect the +UserDatabase contents, unlike for the other realms. If a user +is removed from the database, it will be considered to have no roles. +The useStaticPrincipal attribute of the +UserDatabaseRealm can be used to instead cache the user along +with all its roles. The cached user is not saved and +restored across sessions serialisations. When the user's principal object +is serialized for any reason, it will also be replaced by a static +equivalent object with roles that will no longer reflect the databse +contents. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix docs inconsistencies
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 92ccdb3 Fix docs inconsistencies 92ccdb3 is described below commit 92ccdb339fff3e3e06d57fd28389ceb9ad9cecf1 Author: remm AuthorDate: Fri Sep 3 16:19:18 2021 +0200 Fix docs inconsistencies --- webapps/docs/config/realm.xml | 3 +++ webapps/docs/realm-howto.xml | 20 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index 32c28b0..76e00ef 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -670,6 +670,9 @@ This allows using a static Principal instance disconnected from the database if needed. This makes the bahavior of authenticated prinicipals equivalent to that of the other realms. +If there is a plan to use serialization, it is best to set this to +true as the principal will always be replaced by this +equivalent static principal when serializing. If not specified, the default is false: use a Principal connected to the UserDatabase. diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml index 9f19c6d..d03291c 100644 --- a/webapps/docs/realm-howto.xml +++ b/webapps/docs/realm-howto.xml @@ -809,8 +809,8 @@ configuration documentation. User File Format -The users file uses the same format as the -MemoryRealm. +For the XML file based UserDatabase, the users file uses the +same format as the MemoryRealm. Example @@ -836,12 +836,20 @@ to all virtual hosts and web applications. The default contents of the When a user attempts to access a protected resource for the first time, Tomcat will call the authenticate() method of this Realm. -Once a user has been authenticated, the user (and their associated -roles) are cached within Tomcat for the duration of the user's login. +Once a user has been authenticated, the user becomes associated within +Tomcat for the duration of the user's login. (For FORM-based authentication, that means until the session times out or is invalidated; for BASIC authentication, that means until the user -closes their browser). The cached user is not saved and -restored across sessions serialisations. +closes their browser). However, the user roles will still reflect the +UserDatabase contents, unlike for the other realms. If a user +is removed from the database, it will be considered to have no roles. +The useStaticPrincipal attribute of the +UserDatabaseRealm can be used to instead cache the user along +with all its roles. The cached user is not saved and +restored across sessions serialisations. When the user's principal object +is serialized for any reason, it will also be replaced by a static +equivalent object with roles that will no longer reflect the databse +contents. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: jarsToSkip += derby-*.jar
On Fri, Sep 3, 2021 at 10:03 AM wrote: > > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch main > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > The following commit(s) were added to refs/heads/main by this push: > new e9cbd4c jarsToSkip += derby-*.jar > e9cbd4c is described below > > commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6 > Author: Mark Thomas > AuthorDate: Fri Sep 3 09:02:05 2021 +0100 > > jarsToSkip += derby-*.jar Thanks, I always keep forgetting that ... Rémy > --- > conf/catalina.properties | 1 + > webapps/docs/changelog.xml | 4 > 2 files changed, 5 insertions(+) > > diff --git a/conf/catalina.properties b/conf/catalina.properties > index 012d8fd..d73a8bf 100644 > --- a/conf/catalina.properties > +++ b/conf/catalina.properties > @@ -134,6 +134,7 @@ commons-lang*.jar,\ > commons-logging*.jar,\ > commons-math*.jar,\ > commons-pool*.jar,\ > +derby-*.jar,\ > dom4j-*.jar,\ > easymock-*.jar,\ > ecj-*.jar,\ > diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml > index 6e55bef..36966ab 100644 > --- a/webapps/docs/changelog.xml > +++ b/webapps/docs/changelog.xml > @@ -148,6 +148,10 @@ > contents, and add an option to have it be static, similar to the > other > realms. (remm) > > + > +Add derby-*.jar to the list of JARs to skip when > scanning > +for TLDs, web fragments and annotations. (markt) > + > > > > > - > 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
[Bug 65548] Webapp context not loaded after calling addServiced, check and removeServiced calls
https://bz.apache.org/bugzilla/show_bug.cgi?id=65548 Dileep changed: What|Removed |Added CC||dileepkumar8...@gmail.com -- 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 65548] New: Webapp context not loaded after calling addServiced, check and removeServiced calls
https://bz.apache.org/bugzilla/show_bug.cgi?id=65548
Bug ID: 65548
Summary: Webapp context not loaded after calling addServiced,
check and removeServiced calls
Product: Tomcat 9
Version: 9.0.52
Hardware: PC
OS: Linux
Status: NEW
Severity: regression
Priority: P2
Component: Manager
Assignee: dev@tomcat.apache.org
Reporter: dileepkumar8...@gmail.com
Target Milestone: -
Created attachment 38011
--> https://bz.apache.org/bugzilla/attachment.cgi?id=38011=edit
Tomcat's JMX API Navigation
We are currently using Tomcat 9.0.45 and a webapp context can be loaded
dynamically when the following manager JMX operations are called in sequence:
addServiced()
check()
removeServiced().
The same is not happening with Tomcat 9.0.52.
Steps to reproduce:
1) Create a sample webapp (sample.war can be downloaded from here:
https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/).
2) Turn off autoDeploy in server.xml. For example:
3) Start the Tomcat and open manager UI (http://localhost:8080/manager/html).
4) Copy the sample.war (downloaded in step 1) and paste it in Tomcat's webapps
directory.
5) Use jconsole for Tomcat's JMX APIs (Refer attachment).
6) Navigate to MBeans -> Catalina -> Deployer -> localhost -> Operations
7) Click on "addServiced" operation and provide the name of your war file in
the "name" field ("sample" in this case) and click on "addServiced" button.
"Method successfully invoked" popup comes up and click on "OK" button.
8) Similarly, click on "check" operation and provide the same name ("sample" in
this case). Click on "check" button and the same popup described in step 7
comes up. Click on "OK" button.
9) Finally, click on "removeServiced" operation and provide the same name
("sample" in this case). Click on "removeServiced" button and the same popup
described in step 7 comes up. Click on "OK" button.
After these steps, reload Tomcat manager web UI (mentioned in step 3)and the UI
should show the new webapp ("sample" webapp in this case).
The "sample" webapp appears with the Tomcat 9.0.45 but not with Tomcat 9.0.52.
Also tried by replacing "addServiced" operation with the new "tryAddServiced"
operation but the issue is not resolved.
--
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
[tomcat] branch 9.0.x updated: Rename method for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2007f9c Rename method for consistency
2007f9c is described below
commit 2007f9ca8734eb668984b10447931af913d3f4b2
Author: remm
AuthorDate: Fri Sep 3 10:27:16 2021 +0200
Rename method for consistency
---
.../apache/catalina/users/DataSourceUserDatabase.java | 17 +
.../catalina/users/DataSourceUserDatabaseTests.java | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index ec44e8b..99cf584 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -74,6 +74,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
protected final ConcurrentHashMap modifiedRoles = new
ConcurrentHashMap<>();
protected final ConcurrentHashMap removedRoles = new
ConcurrentHashMap<>();
+
// - Instance Variables
@@ -470,7 +471,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return groups.values().iterator();
@@ -506,7 +507,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return roles.values().iterator();
@@ -542,7 +543,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return users.values().iterator();
@@ -623,7 +624,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findGroupInternal(dbConnection, groupname);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -697,7 +698,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findRoleInternal(dbConnection, rolename);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -750,7 +751,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findUserInternal(dbConnection, username);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
readLock.unlock();
@@ -1033,7 +1034,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
saveInternal(dbConnection);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
writeLock.unlock();
@@ -1527,7 +1528,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*
* @param dbConnection The connection to be closed
*/
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
// Do nothing if the database connection is already closed
if (dbConnection == null) {
diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
index 55194e1..0defa39 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
@@ -89,7 +89,7 @@ public class DataSourceUserDatabaseTests extends
LoggingBaseTest {
return connection;
}
@Override
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
}
@Override
public void
[tomcat] branch 10.0.x updated: Rename method for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9039b4d Rename method for consistency
9039b4d is described below
commit 9039b4dcc56bf172d947d47cc1e6065d78e1b222
Author: remm
AuthorDate: Fri Sep 3 10:27:16 2021 +0200
Rename method for consistency
---
.../apache/catalina/users/DataSourceUserDatabase.java | 17 +
.../catalina/users/DataSourceUserDatabaseTests.java | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index ec44e8b..99cf584 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -74,6 +74,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
protected final ConcurrentHashMap modifiedRoles = new
ConcurrentHashMap<>();
protected final ConcurrentHashMap removedRoles = new
ConcurrentHashMap<>();
+
// - Instance Variables
@@ -470,7 +471,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return groups.values().iterator();
@@ -506,7 +507,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return roles.values().iterator();
@@ -542,7 +543,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return users.values().iterator();
@@ -623,7 +624,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findGroupInternal(dbConnection, groupname);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -697,7 +698,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findRoleInternal(dbConnection, rolename);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -750,7 +751,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findUserInternal(dbConnection, username);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
readLock.unlock();
@@ -1033,7 +1034,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
saveInternal(dbConnection);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
writeLock.unlock();
@@ -1527,7 +1528,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*
* @param dbConnection The connection to be closed
*/
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
// Do nothing if the database connection is already closed
if (dbConnection == null) {
diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
index 55194e1..0defa39 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
@@ -89,7 +89,7 @@ public class DataSourceUserDatabaseTests extends
LoggingBaseTest {
return connection;
}
@Override
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
}
@Override
public
[tomcat] branch main updated: Rename method for consistency
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 791b6af Rename method for consistency
791b6af is described below
commit 791b6afdb3feb6e2a5c1b3b8fd92d4e8361271b4
Author: remm
AuthorDate: Fri Sep 3 10:27:16 2021 +0200
Rename method for consistency
---
.../apache/catalina/users/DataSourceUserDatabase.java | 17 +
.../catalina/users/DataSourceUserDatabaseTests.java | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index ec44e8b..99cf584 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -74,6 +74,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
protected final ConcurrentHashMap modifiedRoles = new
ConcurrentHashMap<>();
protected final ConcurrentHashMap removedRoles = new
ConcurrentHashMap<>();
+
// - Instance Variables
@@ -470,7 +471,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return groups.values().iterator();
@@ -506,7 +507,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return roles.values().iterator();
@@ -542,7 +543,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
}
return users.values().iterator();
@@ -623,7 +624,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findGroupInternal(dbConnection, groupname);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -697,7 +698,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findRoleInternal(dbConnection, rolename);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} else {
return null;
@@ -750,7 +751,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findUserInternal(dbConnection, username);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
readLock.unlock();
@@ -1033,7 +1034,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
saveInternal(dbConnection);
} finally {
-close(dbConnection);
+closeConnection(dbConnection);
}
} finally {
writeLock.unlock();
@@ -1527,7 +1528,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*
* @param dbConnection The connection to be closed
*/
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
// Do nothing if the database connection is already closed
if (dbConnection == null) {
diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
index 55194e1..0defa39 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
@@ -89,7 +89,7 @@ public class DataSourceUserDatabaseTests extends
LoggingBaseTest {
return connection;
}
@Override
-protected void close(Connection dbConnection) {
+protected void closeConnection(Connection dbConnection) {
}
@Override
public void
[tomcat] branch 8.5.x updated: jarsToSkip += derby-*.jar
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new f9138ce jarsToSkip += derby-*.jar f9138ce is described below commit f9138ce7cceea15b0041ec123a209c66c56f35b3 Author: Mark Thomas AuthorDate: Fri Sep 3 09:02:05 2021 +0100 jarsToSkip += derby-*.jar --- conf/catalina.properties | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/conf/catalina.properties b/conf/catalina.properties index dc2186f..a3f7349 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -135,6 +135,7 @@ commons-lang*.jar,\ commons-logging*.jar,\ commons-math*.jar,\ commons-pool*.jar,\ +derby-*.jar,\ dom4j-*.jar,\ easymock-*.jar,\ ecj-*.jar,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cc61240..c3b7d5c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -133,6 +133,10 @@ scheme specific check can be performed. Based on pull request 444 by Robert Rodewald. (markt) + +Add derby-*.jar to the list of JARs to skip when scanning +for TLDs, web fragments and annotations. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: jarsToSkip += derby-*.jar
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 24f6bcd jarsToSkip += derby-*.jar 24f6bcd is described below commit 24f6bcd11ea6a969cb50ee0074a92c28512b7e28 Author: Mark Thomas AuthorDate: Fri Sep 3 09:02:05 2021 +0100 jarsToSkip += derby-*.jar --- conf/catalina.properties | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/conf/catalina.properties b/conf/catalina.properties index cff2aa2..918f8f1 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -134,6 +134,7 @@ commons-lang*.jar,\ commons-logging*.jar,\ commons-math*.jar,\ commons-pool*.jar,\ +derby-*.jar,\ dom4j-*.jar,\ easymock-*.jar,\ ecj-*.jar,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 223b6ec..bfc418d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -148,6 +148,10 @@ contents, and add an option to have it be static, similar to the other realms. (remm) + +Add derby-*.jar to the list of JARs to skip when scanning +for TLDs, web fragments and annotations. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: jarsToSkip += derby-*.jar
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 860bec0 jarsToSkip += derby-*.jar 860bec0 is described below commit 860bec0e9c982adc068aed3a72f8067c2e9e70a7 Author: Mark Thomas AuthorDate: Fri Sep 3 09:02:05 2021 +0100 jarsToSkip += derby-*.jar --- conf/catalina.properties | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/conf/catalina.properties b/conf/catalina.properties index 012d8fd..d73a8bf 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -134,6 +134,7 @@ commons-lang*.jar,\ commons-logging*.jar,\ commons-math*.jar,\ commons-pool*.jar,\ +derby-*.jar,\ dom4j-*.jar,\ easymock-*.jar,\ ecj-*.jar,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0d29a6a..fea61de 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -148,6 +148,10 @@ contents, and add an option to have it be static, similar to the other realms. (remm) + +Add derby-*.jar to the list of JARs to skip when scanning +for TLDs, web fragments and annotations. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: jarsToSkip += derby-*.jar
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e9cbd4c jarsToSkip += derby-*.jar e9cbd4c is described below commit e9cbd4c2cdb958930fed1cfeabdd3e911fc8b1e6 Author: Mark Thomas AuthorDate: Fri Sep 3 09:02:05 2021 +0100 jarsToSkip += derby-*.jar --- conf/catalina.properties | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/conf/catalina.properties b/conf/catalina.properties index 012d8fd..d73a8bf 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -134,6 +134,7 @@ commons-lang*.jar,\ commons-logging*.jar,\ commons-math*.jar,\ commons-pool*.jar,\ +derby-*.jar,\ dom4j-*.jar,\ easymock-*.jar,\ ecj-*.jar,\ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6e55bef..36966ab 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -148,6 +148,10 @@ contents, and add an option to have it be static, similar to the other realms. (remm) + +Add derby-*.jar to the list of JARs to skip when scanning +for TLDs, web fragments and annotations. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] huiwan opened a new pull request #447: Remove catalina ssi from catalina.jar.tmp.bnd file
huiwan opened a new pull request #447: URL: https://github.com/apache/tomcat/pull/447 References to org.apache.catalina.ssi are still contained in catalina.jar after it was moved to a separate catalina-ssi.jar. It should be cleaned up. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
