You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/10/17 15:40:07 UTC
[tomcat] branch 9.0.x updated (0e84fc0936 -> b806fef81f)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0e84fc0936 Add JSON stats to the status servlet
new 1f23ffd018 Add additional exclusions
new b806fef81f Use file extensions for test files to aid build reproducibility
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 2 ++
.../catalina/core/TestPropertiesRoleMappingListener.java | 10 +++++-----
test/webapp-role-mapping/admin | 1 -
.../bug6nnnn/bug69303.txt => webapp-role-mapping/admin.txt} | 2 +-
test/webapp-role-mapping/unmapped | 1 -
.../bug6nnnn/bug69303.txt => webapp-role-mapping/unmapped.txt} | 2 +-
test/webapp-role-mapping/user | 1 -
.../bug6nnnn/bug69303.txt => webapp-role-mapping/user.txt} | 2 +-
8 files changed, 10 insertions(+), 11 deletions(-)
delete mode 100644 test/webapp-role-mapping/admin
copy test/{webapp/bug6nnnn/bug69303.txt => webapp-role-mapping/admin.txt} (97%)
delete mode 100644 test/webapp-role-mapping/unmapped
copy test/{webapp/bug6nnnn/bug69303.txt => webapp-role-mapping/unmapped.txt} (97%)
delete mode 100644 test/webapp-role-mapping/user
copy test/{webapp/bug6nnnn/bug69303.txt => webapp-role-mapping/user.txt} (97%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Use file extensions for test files to aid build reproducibility
Posted by ma...@apache.org.
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
commit b806fef81f224cac9711486e08bcb6bfa8b2da5f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 17 15:07:54 2023 +0100
Use file extensions for test files to aid build reproducibility
Text files (identified by the extension .txt) are already handled
correctly by the build script. Add the file extension so these files are
included in that handling.
---
.../core/TestPropertiesRoleMappingListener.java | 10 +++++-----
test/webapp-role-mapping/admin | 1 -
test/webapp-role-mapping/admin.txt | 18 ++++++++++++++++++
test/webapp-role-mapping/unmapped | 1 -
test/webapp-role-mapping/unmapped.txt | 18 ++++++++++++++++++
test/webapp-role-mapping/user | 1 -
test/webapp-role-mapping/user.txt | 18 ++++++++++++++++++
7 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
index 292483a6fd..4a9c6f3d7d 100644
--- a/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
+++ b/test/org/apache/catalina/core/TestPropertiesRoleMappingListener.java
@@ -139,7 +139,7 @@ public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
for (String role : Arrays.asList("admin", "user", "unmapped")) {
SecurityCollection securityCollection = new SecurityCollection();
- securityCollection.addPattern("/" + role);
+ securityCollection.addPattern("/" + role + ".txt");
SecurityConstraint constraint = new SecurityConstraint();
constraint.addAuthRole(role);
constraint.addCollection(securityCollection);
@@ -149,10 +149,10 @@ public class TestPropertiesRoleMappingListener extends TomcatBaseTest {
tomcat.start();
- testRequest("foo:bar", "/admin", 200);
- testRequest("waldo:fred", "/user", 200);
- testRequest("waldo:fred", "/unmapped", 403);
- testRequest("bar:baz", "/user", 401);
+ testRequest("foo:bar", "/admin.txt", 200);
+ testRequest("waldo:fred", "/user.txt", 200);
+ testRequest("waldo:fred", "/unmapped.txt", 403);
+ testRequest("bar:baz", "/user.txt", 401);
}
private void testRequest(String credentials, String path, int statusCode) throws IOException {
diff --git a/test/webapp-role-mapping/admin b/test/webapp-role-mapping/admin
deleted file mode 100644
index 7fbe952b76..0000000000
--- a/test/webapp-role-mapping/admin
+++ /dev/null
@@ -1 +0,0 @@
-admin
diff --git a/test/webapp-role-mapping/admin.txt b/test/webapp-role-mapping/admin.txt
new file mode 100644
index 0000000000..1c188dc6b5
--- /dev/null
+++ b/test/webapp-role-mapping/admin.txt
@@ -0,0 +1,18 @@
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+admin
diff --git a/test/webapp-role-mapping/unmapped b/test/webapp-role-mapping/unmapped
deleted file mode 100644
index 80a617a00e..0000000000
--- a/test/webapp-role-mapping/unmapped
+++ /dev/null
@@ -1 +0,0 @@
-unmapped
diff --git a/test/webapp-role-mapping/unmapped.txt b/test/webapp-role-mapping/unmapped.txt
new file mode 100644
index 0000000000..292952af74
--- /dev/null
+++ b/test/webapp-role-mapping/unmapped.txt
@@ -0,0 +1,18 @@
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+unmapped
diff --git a/test/webapp-role-mapping/user b/test/webapp-role-mapping/user
deleted file mode 100644
index 4eb8387fed..0000000000
--- a/test/webapp-role-mapping/user
+++ /dev/null
@@ -1 +0,0 @@
-user
diff --git a/test/webapp-role-mapping/user.txt b/test/webapp-role-mapping/user.txt
new file mode 100644
index 0000000000..0fed8a48b9
--- /dev/null
+++ b/test/webapp-role-mapping/user.txt
@@ -0,0 +1,18 @@
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+user
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add additional exclusions
Posted by ma...@apache.org.
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
commit 1f23ffd018d6a83d80241daf86883a76552f2d4e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 17 14:29:03 2023 +0100
Add additional exclusions
These are developer specific files that should not be part of the
release.
---
build.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build.xml b/build.xml
index 1976c20b50..efed0fd780 100644
--- a/build.xml
+++ b/build.xml
@@ -2434,7 +2434,9 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<filename name="**/.settings/**" />
<filename name="**/.classpath"/>
<filename name="**/.checkstyle"/>
+ <filename name="**/.pmd"/>
<filename name="**/.project"/>
+ <filename name="**/.sdkmanrc"/>
<filename name="**/nbproject/**"/>
<filename name="**/output/**"/>
<!-- Commented out, because
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org