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:57:34 UTC
[tomcat] branch 8.5.x updated (a790eb4 -> 5611ee4)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from a790eb4 Fix Javadoc warnings that broke the build
new 44fb1eb Move all the installer files into a single directory
new 5611ee4 Remove unused cobertura logging configuration file
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 | 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 | 5 ++++
10 files changed, 12 insertions(+), 38 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/02: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 44fb1ebb346fe5fffe80cac31bc68c8d2ae5e0c3
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 b3cacd3..75c9b34 100644
--- a/build.xml
+++ b/build.xml
@@ -2126,11 +2126,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}" />
@@ -2138,7 +2138,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 d10be4b..298336d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,11 @@
Expand the <code>spotbugs</code> Ant task to also cover test code.
(markt)
</add>
+ <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/02: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5611ee4a93903a1d306189dbd7c6dfe39c2a4a42
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