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 2022/03/22 08:54:15 UTC
[tomcat] branch 10.0.x updated (a33d003 -> 490e707)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from a33d003 Repeatable builds: Need to use a LinkedHashSet to maintain order
new 6fcd296 Move all the installer files into a single directory
new 0a4f673 Remove unused cobertura logging configuration file
new 490e707 Re-order sections to use expected order
The 3 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 | 6 ++--
res/cobertura/logback.xml | 31 ---------------------
res/{ => install-win}/INSTALLLICENSE | 0
res/{ => install-win}/header.bmp | Bin
res/{ => install-win}/side_left.bmp | Bin
.../tomcat-users_1.xml | 0
.../tomcat-users_2.xml | 0
res/{ => install-win}/tomcat.ico | Bin
res/{ => install-win}/tomcat.nsi | 8 +++---
webapps/docs/changelog.xml | 23 +++++++++------
10 files changed, 21 insertions(+), 47 deletions(-)
delete mode 100644 res/cobertura/logback.xml
rename res/{ => install-win}/INSTALLLICENSE (100%)
rename res/{ => install-win}/header.bmp (100%)
rename res/{ => install-win}/side_left.bmp (100%)
rename res/{confinstall => install-win}/tomcat-users_1.xml (100%)
rename res/{confinstall => install-win}/tomcat-users_2.xml (100%)
rename res/{ => install-win}/tomcat.ico (100%)
rename res/{ => install-win}/tomcat.nsi (99%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Move all the installer files into a single directory
Posted by ma...@apache.org.
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
commit 6fcd296afde525edc0293ca744e4529c00c1bcae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 22 08:48:26 2022 +0000
Move all the installer files into a single directory
---
build.xml | 6 +++---
res/{ => install-win}/INSTALLLICENSE | 0
res/{ => install-win}/header.bmp | Bin
res/{ => install-win}/side_left.bmp | Bin
res/{confinstall => install-win}/tomcat-users_1.xml | 0
res/{confinstall => install-win}/tomcat-users_2.xml | 0
res/{ => install-win}/tomcat.ico | Bin
res/{ => install-win}/tomcat.nsi | 8 ++++----
webapps/docs/changelog.xml | 5 +++++
9 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 6debdff..e92ee2b 100644
--- a/build.xml
+++ b/build.xml
@@ -2461,11 +2461,11 @@ skip.installer property in build.properties" />
<target name="-installer-prep"
unless="skip.installer" depends="dist-static,-installer-init">
<copy todir="${tomcat.dist}">
- <fileset dir="res">
+ <fileset dir="res/install-win">
<include name="INSTALLLICENSE" />
<include name="*.bmp" />
<include name="*.ico" />
- <include name="confinstall/**" />
+ <include name="*.xml" />
</fileset>
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
@@ -2473,7 +2473,7 @@ skip.installer property in build.properties" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.system.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsdialogs.dll}" todir="${tomcat.dist}" />
- <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" overwrite="true" encoding="ISO-8859-1">
+ <copy file="res/install-win/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" overwrite="true" encoding="ISO-8859-1">
<filterset refid="version.filters"/>
</copy>
<fixcrlf srcdir="${tomcat.dist}" eol="crlf"
diff --git a/res/INSTALLLICENSE b/res/install-win/INSTALLLICENSE
similarity index 100%
rename from res/INSTALLLICENSE
rename to res/install-win/INSTALLLICENSE
diff --git a/res/header.bmp b/res/install-win/header.bmp
similarity index 100%
rename from res/header.bmp
rename to res/install-win/header.bmp
diff --git a/res/side_left.bmp b/res/install-win/side_left.bmp
similarity index 100%
rename from res/side_left.bmp
rename to res/install-win/side_left.bmp
diff --git a/res/confinstall/tomcat-users_1.xml b/res/install-win/tomcat-users_1.xml
similarity index 100%
rename from res/confinstall/tomcat-users_1.xml
rename to res/install-win/tomcat-users_1.xml
diff --git a/res/confinstall/tomcat-users_2.xml b/res/install-win/tomcat-users_2.xml
similarity index 100%
rename from res/confinstall/tomcat-users_2.xml
rename to res/install-win/tomcat-users_2.xml
diff --git a/res/tomcat.ico b/res/install-win/tomcat.ico
similarity index 100%
rename from res/tomcat.ico
rename to res/install-win/tomcat.ico
diff --git a/res/tomcat.nsi b/res/install-win/tomcat.nsi
similarity index 99%
rename from res/tomcat.nsi
rename to res/install-win/tomcat.nsi
index 3f92c83..9b0d5f2 100644
--- a/res/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -160,8 +160,8 @@ Var ServiceInstallLog
ReserveFile System.dll
ReserveFile nsDialogs.dll
- ReserveFile confinstall\tomcat-users_1.xml
- ReserveFile confinstall\tomcat-users_2.xml
+ ReserveFile tomcat-users_1.xml
+ ReserveFile tomcat-users_2.xml
;--------------------------------
;Installer Sections
@@ -1091,8 +1091,8 @@ Function configure
; that is automatically deleted when the installer exits.
InitPluginsDir
SetOutPath $PLUGINSDIR
- File confinstall\tomcat-users_1.xml
- File confinstall\tomcat-users_2.xml
+ File tomcat-users_1.xml
+ File tomcat-users_2.xml
; Build final tomcat-users.xml
Delete "$INSTDIR\conf\tomcat-users.xml"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 67f8bcb..a950c35 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -170,6 +170,11 @@
Remove OSGi annotations dependency as it is no longer required with bnd
6.2.0. (markt)
</update>
+ <scode>
+ Refactor the resource files for the Apache Tomcat installer for Windows
+ so that all the resource files are located in a single directory in the
+ source tree. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Remove unused cobertura logging configuration file
Posted by ma...@apache.org.
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
commit 0a4f6735ed6dc94f5c006e2e06e4da0342dd8b7c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 22 08:49:05 2022 +0000
Remove unused cobertura logging configuration file
---
res/cobertura/logback.xml | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/res/cobertura/logback.xml b/res/cobertura/logback.xml
deleted file mode 100644
index 72d947b..0000000
--- a/res/cobertura/logback.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Re-order sections to use expected order
Posted by ma...@apache.org.
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
commit 490e707dc6c66a53d9a1bd24d5e0b2819ee1b7c6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 22 08:49:31 2022 +0000
Re-order sections to use expected order
---
webapps/docs/changelog.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a950c35..987cdc4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,15 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Use a constant for the default TLS cipher suite. This will allow
+ skipping setting it in some cases (for example, it does not make
+ sense for OpenSSL TLS 1.3). (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
@@ -131,15 +140,6 @@
</fix>
</changelog>
</subsection>
- <subsection name="Coyote">
- <changelog>
- <fix>
- Use a constant for the default TLS cipher suite. This will allow
- skipping setting it in some cases (for example, it does not make
- sense for OpenSSL TLS 1.3). (remm)
- </fix>
- </changelog>
- </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org