[tomcat] branch 10.1.x updated: Update docs for procrun (Commons Daemon)
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 5b52f50c67 Update docs for procrun (Commons Daemon) 5b52f50c67 is described below commit 5b52f50c67f4bfdd5008fe885f5afe34197df4c8 Author: Mark Thomas AuthorDate: Wed Nov 30 15:58:14 2022 + Update docs for procrun (Commons Daemon) --- webapps/docs/windows-service-howto.xml | 660 +++-- 1 file changed, 379 insertions(+), 281 deletions(-) diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index c03ef928fa..58c26c1e20 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -33,311 +33,409 @@ - - -Tomcat is a service application for running Tomcat - as a Windows service. - - - -Tomcatw is a GUI application for monitoring and -configuring Tomcat services. - -The available command line options are: - -//ES// -Edit service configuration -This is the default operation. It is called if the no option is -provided but the executable is renamed to servicenameW.exe + Tomcatw is a GUI application for monitoring and + configuring Tomcat services. + + + + Each command line directive is in the form of + //XX[//ServiceName] + + If the //ServiceName component is omitted, then the service + name is assumed to be the name of the file less the w suffix. So the default + service name is Tomcat. + + The available command line directives are: + + + + //ES + Edit service configuration + This is the default operation. It is called if the no option is + provided. Starts the GUI application which allows the service + configuration to be modified, started and stopped. -//MS// -Monitor service -Put the icon in the system tray + + //MS + Monitor service + Starts the GUI application and minimizes it to the system tray. - + + //MR + Monitor & run service + Starts the GUI application and minimizes it to the system tray. Start + the service if it is not currently running. + + + //MQ + Monitor quit + Stop any running monitor for the service. + + + - - -Each command line directive is in the form of //XX//ServiceName - -The available command line options are: + + + Tomcat is a service application for running Tomcat + as a Windows service. + + + +Each command line directive is in the form of +//XX[//ServiceName] + +The available command line directives are: -//TS// + +//TS Run the service as console application This is the default operation. It is called if the no option is provided. The ServiceName is the name of the executable without exe suffix, meaning Tomcat - -//RS// + + +//RS Run the service Called only from ServiceManager - -//SS// + + +//ES +Start (execute) the service + + + +//SS Stop the service - -//US// + + +//US Update service parameters - -//IS// + + +//IS Install service - -//DS// + + +//DS Delete service Stops the service if running - + + +//PS +Print service +Prints the command to (re-)create the current configuration + + +//PP[//seconds] +Pause service +Default is 60 seconds + + +//VS +Version +Print version and exit + + +//? +Help +Print usage and exit + + - - - -Each command line parameter is prefixed with --. If the command line -parameter is prefixed with ++ then it's value will be appended to the -existing option. -If the environment variable with the same name as command line parameter but -prefixed with PR_ exists it will take precedence. -For example: -set PR_CLASSPATH=xx.jar - -is equivalent to providing ---Classpath=xx.jar - as command line parameter. + + +Each command line parameter is prefixed with --. If the +command line parameter is prefixed with ++, and the parameter +supports multiple values, then it's value will be appended to the existing +option. In the table below, parameters that support multiple values are +prefixed with ++. + +If the environment variable with the same name as command line parameter +but prefixed with PR_ exists it will take precedence. For +example: + +set PR_CLASSPATH=xx.jar + +is equivalent to providing
[tomcat] branch main updated: Update docs for procrun (Commons Daemon)
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 63ab23f6a3 Update docs for procrun (Commons Daemon) 63ab23f6a3 is described below commit 63ab23f6a3bd42025483726820e01618b32040d8 Author: Mark Thomas AuthorDate: Wed Nov 30 15:58:14 2022 + Update docs for procrun (Commons Daemon) --- webapps/docs/windows-service-howto.xml | 660 +++-- 1 file changed, 379 insertions(+), 281 deletions(-) diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index c03ef928fa..58c26c1e20 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -33,311 +33,409 @@ - - -Tomcat is a service application for running Tomcat - as a Windows service. - - - -Tomcatw is a GUI application for monitoring and -configuring Tomcat services. - -The available command line options are: - -//ES// -Edit service configuration -This is the default operation. It is called if the no option is -provided but the executable is renamed to servicenameW.exe + Tomcatw is a GUI application for monitoring and + configuring Tomcat services. + + + + Each command line directive is in the form of + //XX[//ServiceName] + + If the //ServiceName component is omitted, then the service + name is assumed to be the name of the file less the w suffix. So the default + service name is Tomcat. + + The available command line directives are: + + + + //ES + Edit service configuration + This is the default operation. It is called if the no option is + provided. Starts the GUI application which allows the service + configuration to be modified, started and stopped. -//MS// -Monitor service -Put the icon in the system tray + + //MS + Monitor service + Starts the GUI application and minimizes it to the system tray. - + + //MR + Monitor & run service + Starts the GUI application and minimizes it to the system tray. Start + the service if it is not currently running. + + + //MQ + Monitor quit + Stop any running monitor for the service. + + + - - -Each command line directive is in the form of //XX//ServiceName - -The available command line options are: + + + Tomcat is a service application for running Tomcat + as a Windows service. + + + +Each command line directive is in the form of +//XX[//ServiceName] + +The available command line directives are: -//TS// + +//TS Run the service as console application This is the default operation. It is called if the no option is provided. The ServiceName is the name of the executable without exe suffix, meaning Tomcat - -//RS// + + +//RS Run the service Called only from ServiceManager - -//SS// + + +//ES +Start (execute) the service + + + +//SS Stop the service - -//US// + + +//US Update service parameters - -//IS// + + +//IS Install service - -//DS// + + +//DS Delete service Stops the service if running - + + +//PS +Print service +Prints the command to (re-)create the current configuration + + +//PP[//seconds] +Pause service +Default is 60 seconds + + +//VS +Version +Print version and exit + + +//? +Help +Print usage and exit + + - - - -Each command line parameter is prefixed with --. If the command line -parameter is prefixed with ++ then it's value will be appended to the -existing option. -If the environment variable with the same name as command line parameter but -prefixed with PR_ exists it will take precedence. -For example: -set PR_CLASSPATH=xx.jar - -is equivalent to providing ---Classpath=xx.jar - as command line parameter. + + +Each command line parameter is prefixed with --. If the +command line parameter is prefixed with ++, and the parameter +supports multiple values, then it's value will be appended to the existing +option. In the table below, parameters that support multiple values are +prefixed with ++. + +If the environment variable with the same name as command line parameter +but prefixed with PR_ exists it will take precedence. For +example: + +set PR_CLASSPATH=xx.jar + +is equivalent to providing + +
[tomcat] branch 9.0.x updated: Update docs for procrun (Commons Daemon)
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 85616de0b1 Update docs for procrun (Commons Daemon) 85616de0b1 is described below commit 85616de0b1c3d3f7cae14cfd86447c959282dc45 Author: Mark Thomas AuthorDate: Wed Nov 30 15:58:14 2022 + Update docs for procrun (Commons Daemon) --- webapps/docs/windows-service-howto.xml | 660 +++-- 1 file changed, 379 insertions(+), 281 deletions(-) diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index c03ef928fa..58c26c1e20 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -33,311 +33,409 @@ - - -Tomcat is a service application for running Tomcat - as a Windows service. - - - -Tomcatw is a GUI application for monitoring and -configuring Tomcat services. - -The available command line options are: - -//ES// -Edit service configuration -This is the default operation. It is called if the no option is -provided but the executable is renamed to servicenameW.exe + Tomcatw is a GUI application for monitoring and + configuring Tomcat services. + + + + Each command line directive is in the form of + //XX[//ServiceName] + + If the //ServiceName component is omitted, then the service + name is assumed to be the name of the file less the w suffix. So the default + service name is Tomcat. + + The available command line directives are: + + + + //ES + Edit service configuration + This is the default operation. It is called if the no option is + provided. Starts the GUI application which allows the service + configuration to be modified, started and stopped. -//MS// -Monitor service -Put the icon in the system tray + + //MS + Monitor service + Starts the GUI application and minimizes it to the system tray. - + + //MR + Monitor & run service + Starts the GUI application and minimizes it to the system tray. Start + the service if it is not currently running. + + + //MQ + Monitor quit + Stop any running monitor for the service. + + + - - -Each command line directive is in the form of //XX//ServiceName - -The available command line options are: + + + Tomcat is a service application for running Tomcat + as a Windows service. + + + +Each command line directive is in the form of +//XX[//ServiceName] + +The available command line directives are: -//TS// + +//TS Run the service as console application This is the default operation. It is called if the no option is provided. The ServiceName is the name of the executable without exe suffix, meaning Tomcat - -//RS// + + +//RS Run the service Called only from ServiceManager - -//SS// + + +//ES +Start (execute) the service + + + +//SS Stop the service - -//US// + + +//US Update service parameters - -//IS// + + +//IS Install service - -//DS// + + +//DS Delete service Stops the service if running - + + +//PS +Print service +Prints the command to (re-)create the current configuration + + +//PP[//seconds] +Pause service +Default is 60 seconds + + +//VS +Version +Print version and exit + + +//? +Help +Print usage and exit + + - - - -Each command line parameter is prefixed with --. If the command line -parameter is prefixed with ++ then it's value will be appended to the -existing option. -If the environment variable with the same name as command line parameter but -prefixed with PR_ exists it will take precedence. -For example: -set PR_CLASSPATH=xx.jar - -is equivalent to providing ---Classpath=xx.jar - as command line parameter. + + +Each command line parameter is prefixed with --. If the +command line parameter is prefixed with ++, and the parameter +supports multiple values, then it's value will be appended to the existing +option. In the table below, parameters that support multiple values are +prefixed with ++. + +If the environment variable with the same name as command line parameter +but prefixed with PR_ exists it will take precedence. For +example: + +set PR_CLASSPATH=xx.jar + +is equivalent to providing +
[tomcat] branch 8.5.x updated: Update docs for procrun (Commons Daemon)
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 bd29b1eee4 Update docs for procrun (Commons Daemon) bd29b1eee4 is described below commit bd29b1eee445f240dc8ddc556f50493690655e20 Author: Mark Thomas AuthorDate: Wed Nov 30 15:58:14 2022 + Update docs for procrun (Commons Daemon) --- webapps/docs/windows-service-howto.xml | 660 +++-- 1 file changed, 379 insertions(+), 281 deletions(-) diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index c03ef928fa..58c26c1e20 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -33,311 +33,409 @@ - - -Tomcat is a service application for running Tomcat - as a Windows service. - - - -Tomcatw is a GUI application for monitoring and -configuring Tomcat services. - -The available command line options are: - -//ES// -Edit service configuration -This is the default operation. It is called if the no option is -provided but the executable is renamed to servicenameW.exe + Tomcatw is a GUI application for monitoring and + configuring Tomcat services. + + + + Each command line directive is in the form of + //XX[//ServiceName] + + If the //ServiceName component is omitted, then the service + name is assumed to be the name of the file less the w suffix. So the default + service name is Tomcat. + + The available command line directives are: + + + + //ES + Edit service configuration + This is the default operation. It is called if the no option is + provided. Starts the GUI application which allows the service + configuration to be modified, started and stopped. -//MS// -Monitor service -Put the icon in the system tray + + //MS + Monitor service + Starts the GUI application and minimizes it to the system tray. - + + //MR + Monitor & run service + Starts the GUI application and minimizes it to the system tray. Start + the service if it is not currently running. + + + //MQ + Monitor quit + Stop any running monitor for the service. + + + - - -Each command line directive is in the form of //XX//ServiceName - -The available command line options are: + + + Tomcat is a service application for running Tomcat + as a Windows service. + + + +Each command line directive is in the form of +//XX[//ServiceName] + +The available command line directives are: -//TS// + +//TS Run the service as console application This is the default operation. It is called if the no option is provided. The ServiceName is the name of the executable without exe suffix, meaning Tomcat - -//RS// + + +//RS Run the service Called only from ServiceManager - -//SS// + + +//ES +Start (execute) the service + + + +//SS Stop the service - -//US// + + +//US Update service parameters - -//IS// + + +//IS Install service - -//DS// + + +//DS Delete service Stops the service if running - + + +//PS +Print service +Prints the command to (re-)create the current configuration + + +//PP[//seconds] +Pause service +Default is 60 seconds + + +//VS +Version +Print version and exit + + +//? +Help +Print usage and exit + + - - - -Each command line parameter is prefixed with --. If the command line -parameter is prefixed with ++ then it's value will be appended to the -existing option. -If the environment variable with the same name as command line parameter but -prefixed with PR_ exists it will take precedence. -For example: -set PR_CLASSPATH=xx.jar - -is equivalent to providing ---Classpath=xx.jar - as command line parameter. + + +Each command line parameter is prefixed with --. If the +command line parameter is prefixed with ++, and the parameter +supports multiple values, then it's value will be appended to the existing +option. In the table below, parameters that support multiple values are +prefixed with ++. + +If the environment variable with the same name as command line parameter +but prefixed with PR_ exists it will take precedence. For +example: + +set PR_CLASSPATH=xx.jar + +is equivalent to providing +
[GitHub] [tomcat] markt-asf commented on pull request #571: some el implements spi loader not support comment line
markt-asf commented on PR #571: URL: https://github.com/apache/tomcat/pull/571#issuecomment-1332407078 This is a WONTFIX. EL implementations that do not ignore comment lines are broken and should be fixed. The Tomcat project's default position is that we do not change Tomcat to workaround other people's broken code. -- 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
[GitHub] [tomcat] markt-asf closed pull request #571: some el implements spi loader not support comment line
markt-asf closed pull request #571: some el implements spi loader not support comment line URL: https://github.com/apache/tomcat/pull/571 -- 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
[tomcat] branch main updated: Replace references to CVS with more generic language
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 31731f0178 Replace references to CVS with more generic language
31731f0178 is described below
commit 31731f01788f53f175bda7df1dcd1c48edf6f646
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:07:12 2022 +
Replace references to CVS with more generic language
---
webapps/docs/appdev/installation.xml | 16 +++
webapps/docs/appdev/processes.xml| 90 +++-
webapps/docs/appdev/source.xml | 58 ++-
webapps/docs/changelog.xml | 5 ++
webapps/docs/config/host.xml | 3 +-
5 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index dd40ff568e..b232c1542d 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -81,19 +81,17 @@ execute the ant shell command directly.
-
+
Besides the required tools described above, you are strongly encouraged
-to download and install a source code control system, such as the
-Concurrent Version System (CVS), to maintain historical
-versions of the source files that make up your web application. Besides
-the server, you will also need appropriate client
-tools to check out source code files, and check in modified versions.
+to download and install a source code control system, such as Git,
+Subversion, CVS or one of the many alternatives. You will need appropriate
+client tools to check out source code files, and check in modified versions
and,
+depending on the tool and hosting option you choose, you may need to obtain and
+install server software or sign up for an account with a cloud provider.
Detailed instructions for installing and using source code control
-applications is beyond the scope of this manual. However, CVS server and
-client tools for many platforms (along with documentation) can be downloaded
-from http://www.cvshome.org/";>http://www.cvshome.org/.
+applications is beyond the scope of this manual.
diff --git a/webapps/docs/appdev/processes.xml
b/webapps/docs/appdev/processes.xml
index 9ee5112554..758db1b235 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -43,11 +43,10 @@ multiple programmers involved, as long as you have an
appropriate source code
control system and internal team rules about who is working on what parts
of the application at any given time.
-The task descriptions below assume that you will be using CVS for source
-code control, and that you have already configured access to the appropriate
-CVS repository. Instructions for doing this are beyond the scope of this
-manual. If you are using a different source code control environment, you
-will need to figure out the corresponding commands for your system.
+The task descriptions below do not assume any particular source code control
+system but simply identify when and what source code control tasks are
typically
+performed. You will need to idenitfy the appropriate source code control
+commands for your system.
@@ -83,10 +82,8 @@ be using. The directory structure is described in the
previous section, or you can use the
sample application as a starting point.
-Create your project source directory, and define it within your CVS
-repository. This might be done by a series of commands like this, where
-{project} is the name under which your project should be
-stored in the CVS repository, and {username} is your login username:
+Create your project source directory, and define it within your source code
+control system. This might be done by a series of commands like this:
+cvs or svn or git ... <-- Add this structure to the appropriate repository
+]]>
-Now, to verify that it was created correctly in CVS, we will perform a
-checkout of the new project:
-
+To verify that the project was created correctly in the source code control
+repository, you may wish to check out the project to a separate directory and
+confirm that all the expected contents are present.
Next, you will need to create and check in an initial version of the
build.xml script to be used for development. For getting
@@ -111,12 +106,8 @@ or code it from scratch.
-
-Until you perform the CVS commit, your changes are local to your own
-development directory. Committing makes those changes visible to other
-developers on your team that are sharing the same CVS repository.
+cvs or svn or git ... <-- Add this file to the repository
+]]>
The next step is to customize the Ant properties that are
named in the build.xml script. This is done by creating a
@@ -137,8 +128,8 @@ manager.username=myusername
manager.password=mypassword
In general, you will not want to check the
-build.properties f
[tomcat] branch 10.1.x updated: Replace references to CVS with more generic language
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1d684a5ec6 Replace references to CVS with more generic language
1d684a5ec6 is described below
commit 1d684a5ec6711dd6156939d3107e7f1e0c17a84f
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:07:12 2022 +
Replace references to CVS with more generic language
---
webapps/docs/appdev/installation.xml | 16 +++
webapps/docs/appdev/processes.xml| 90 +++-
webapps/docs/appdev/source.xml | 58 ++-
webapps/docs/changelog.xml | 5 ++
webapps/docs/config/host.xml | 3 +-
5 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index dd40ff568e..b232c1542d 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -81,19 +81,17 @@ execute the ant shell command directly.
-
+
Besides the required tools described above, you are strongly encouraged
-to download and install a source code control system, such as the
-Concurrent Version System (CVS), to maintain historical
-versions of the source files that make up your web application. Besides
-the server, you will also need appropriate client
-tools to check out source code files, and check in modified versions.
+to download and install a source code control system, such as Git,
+Subversion, CVS or one of the many alternatives. You will need appropriate
+client tools to check out source code files, and check in modified versions
and,
+depending on the tool and hosting option you choose, you may need to obtain and
+install server software or sign up for an account with a cloud provider.
Detailed instructions for installing and using source code control
-applications is beyond the scope of this manual. However, CVS server and
-client tools for many platforms (along with documentation) can be downloaded
-from http://www.cvshome.org/";>http://www.cvshome.org/.
+applications is beyond the scope of this manual.
diff --git a/webapps/docs/appdev/processes.xml
b/webapps/docs/appdev/processes.xml
index 9ee5112554..758db1b235 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -43,11 +43,10 @@ multiple programmers involved, as long as you have an
appropriate source code
control system and internal team rules about who is working on what parts
of the application at any given time.
-The task descriptions below assume that you will be using CVS for source
-code control, and that you have already configured access to the appropriate
-CVS repository. Instructions for doing this are beyond the scope of this
-manual. If you are using a different source code control environment, you
-will need to figure out the corresponding commands for your system.
+The task descriptions below do not assume any particular source code control
+system but simply identify when and what source code control tasks are
typically
+performed. You will need to idenitfy the appropriate source code control
+commands for your system.
@@ -83,10 +82,8 @@ be using. The directory structure is described in the
previous section, or you can use the
sample application as a starting point.
-Create your project source directory, and define it within your CVS
-repository. This might be done by a series of commands like this, where
-{project} is the name under which your project should be
-stored in the CVS repository, and {username} is your login username:
+Create your project source directory, and define it within your source code
+control system. This might be done by a series of commands like this:
+cvs or svn or git ... <-- Add this structure to the appropriate repository
+]]>
-Now, to verify that it was created correctly in CVS, we will perform a
-checkout of the new project:
-
+To verify that the project was created correctly in the source code control
+repository, you may wish to check out the project to a separate directory and
+confirm that all the expected contents are present.
Next, you will need to create and check in an initial version of the
build.xml script to be used for development. For getting
@@ -111,12 +106,8 @@ or code it from scratch.
-
-Until you perform the CVS commit, your changes are local to your own
-development directory. Committing makes those changes visible to other
-developers on your team that are sharing the same CVS repository.
+cvs or svn or git ... <-- Add this file to the repository
+]]>
The next step is to customize the Ant properties that are
named in the build.xml script. This is done by creating a
@@ -137,8 +128,8 @@ manager.username=myusername
manager.password=mypassword
In general, you will not want to check the
-build.properti
[tomcat] branch 9.0.x updated: Replace references to CVS with more generic language
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 538d0a9e32 Replace references to CVS with more generic language
538d0a9e32 is described below
commit 538d0a9e32f721500bee9e35e2f45851501a5e88
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:07:12 2022 +
Replace references to CVS with more generic language
---
webapps/docs/appdev/installation.xml | 16 +++
webapps/docs/appdev/processes.xml| 90 +++-
webapps/docs/appdev/source.xml | 58 ++-
webapps/docs/changelog.xml | 5 ++
webapps/docs/config/host.xml | 3 +-
5 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index dd40ff568e..b232c1542d 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -81,19 +81,17 @@ execute the ant shell command directly.
-
+
Besides the required tools described above, you are strongly encouraged
-to download and install a source code control system, such as the
-Concurrent Version System (CVS), to maintain historical
-versions of the source files that make up your web application. Besides
-the server, you will also need appropriate client
-tools to check out source code files, and check in modified versions.
+to download and install a source code control system, such as Git,
+Subversion, CVS or one of the many alternatives. You will need appropriate
+client tools to check out source code files, and check in modified versions
and,
+depending on the tool and hosting option you choose, you may need to obtain and
+install server software or sign up for an account with a cloud provider.
Detailed instructions for installing and using source code control
-applications is beyond the scope of this manual. However, CVS server and
-client tools for many platforms (along with documentation) can be downloaded
-from http://www.cvshome.org/";>http://www.cvshome.org/.
+applications is beyond the scope of this manual.
diff --git a/webapps/docs/appdev/processes.xml
b/webapps/docs/appdev/processes.xml
index 9ee5112554..758db1b235 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -43,11 +43,10 @@ multiple programmers involved, as long as you have an
appropriate source code
control system and internal team rules about who is working on what parts
of the application at any given time.
-The task descriptions below assume that you will be using CVS for source
-code control, and that you have already configured access to the appropriate
-CVS repository. Instructions for doing this are beyond the scope of this
-manual. If you are using a different source code control environment, you
-will need to figure out the corresponding commands for your system.
+The task descriptions below do not assume any particular source code control
+system but simply identify when and what source code control tasks are
typically
+performed. You will need to idenitfy the appropriate source code control
+commands for your system.
@@ -83,10 +82,8 @@ be using. The directory structure is described in the
previous section, or you can use the
sample application as a starting point.
-Create your project source directory, and define it within your CVS
-repository. This might be done by a series of commands like this, where
-{project} is the name under which your project should be
-stored in the CVS repository, and {username} is your login username:
+Create your project source directory, and define it within your source code
+control system. This might be done by a series of commands like this:
+cvs or svn or git ... <-- Add this structure to the appropriate repository
+]]>
-Now, to verify that it was created correctly in CVS, we will perform a
-checkout of the new project:
-
+To verify that the project was created correctly in the source code control
+repository, you may wish to check out the project to a separate directory and
+confirm that all the expected contents are present.
Next, you will need to create and check in an initial version of the
build.xml script to be used for development. For getting
@@ -111,12 +106,8 @@ or code it from scratch.
-
-Until you perform the CVS commit, your changes are local to your own
-development directory. Committing makes those changes visible to other
-developers on your team that are sharing the same CVS repository.
+cvs or svn or git ... <-- Add this file to the repository
+]]>
The next step is to customize the Ant properties that are
named in the build.xml script. This is done by creating a
@@ -137,8 +128,8 @@ manager.username=myusername
manager.password=mypassword
In general, you will not want to check the
-build.properties
[tomcat] branch 8.5.x updated: Replace references to CVS with more generic language
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 2fa4b7a89b Replace references to CVS with more generic language
2fa4b7a89b is described below
commit 2fa4b7a89b1eb7ad238e0002fa28cb253a17ff79
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:07:12 2022 +
Replace references to CVS with more generic language
---
webapps/docs/appdev/installation.xml | 16 +++
webapps/docs/appdev/processes.xml| 90 +++-
webapps/docs/appdev/source.xml | 58 ++-
webapps/docs/changelog.xml | 5 ++
webapps/docs/config/host.xml | 3 +-
5 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index 01d032a50d..8a85a2ec8b 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -81,19 +81,17 @@ execute the ant shell command directly.
-
+
Besides the required tools described above, you are strongly encouraged
-to download and install a source code control system, such as the
-Concurrent Version System (CVS), to maintain historical
-versions of the source files that make up your web application. Besides
-the server, you will also need appropriate client
-tools to check out source code files, and check in modified versions.
+to download and install a source code control system, such as Git,
+Subversion, CVS or one of the many alternatives. You will need appropriate
+client tools to check out source code files, and check in modified versions
and,
+depending on the tool and hosting option you choose, you may need to obtain and
+install server software or sign up for an account with a cloud provider.
Detailed instructions for installing and using source code control
-applications is beyond the scope of this manual. However, CVS server and
-client tools for many platforms (along with documentation) can be downloaded
-from http://www.cvshome.org/";>http://www.cvshome.org/.
+applications is beyond the scope of this manual.
diff --git a/webapps/docs/appdev/processes.xml
b/webapps/docs/appdev/processes.xml
index 9ee5112554..758db1b235 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -43,11 +43,10 @@ multiple programmers involved, as long as you have an
appropriate source code
control system and internal team rules about who is working on what parts
of the application at any given time.
-The task descriptions below assume that you will be using CVS for source
-code control, and that you have already configured access to the appropriate
-CVS repository. Instructions for doing this are beyond the scope of this
-manual. If you are using a different source code control environment, you
-will need to figure out the corresponding commands for your system.
+The task descriptions below do not assume any particular source code control
+system but simply identify when and what source code control tasks are
typically
+performed. You will need to idenitfy the appropriate source code control
+commands for your system.
@@ -83,10 +82,8 @@ be using. The directory structure is described in the
previous section, or you can use the
sample application as a starting point.
-Create your project source directory, and define it within your CVS
-repository. This might be done by a series of commands like this, where
-{project} is the name under which your project should be
-stored in the CVS repository, and {username} is your login username:
+Create your project source directory, and define it within your source code
+control system. This might be done by a series of commands like this:
+cvs or svn or git ... <-- Add this structure to the appropriate repository
+]]>
-Now, to verify that it was created correctly in CVS, we will perform a
-checkout of the new project:
-
+To verify that the project was created correctly in the source code control
+repository, you may wish to check out the project to a separate directory and
+confirm that all the expected contents are present.
Next, you will need to create and check in an initial version of the
build.xml script to be used for development. For getting
@@ -111,12 +106,8 @@ or code it from scratch.
-
-Until you perform the CVS commit, your changes are local to your own
-development directory. Committing makes those changes visible to other
-developers on your team that are sharing the same CVS repository.
+cvs or svn or git ... <-- Add this file to the repository
+]]>
The next step is to customize the Ant properties that are
named in the build.xml script. This is done by creating a
@@ -137,8 +128,8 @@ manager.username=myusername
manager.password=mypassword
In general, you will not want to check the
-build.properties
[GitHub] [tomcat] markt-asf commented on pull request #565: updated link to download cvs
markt-asf commented on PR #565: URL: https://github.com/apache/tomcat/pull/565#issuecomment-1332484054 I've updated the docs to use more generic language. -- 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
[GitHub] [tomcat] markt-asf closed pull request #565: updated link to download cvs
markt-asf closed pull request #565: updated link to download cvs URL: https://github.com/apache/tomcat/pull/565 -- 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
[tomcat] branch main updated: Improvements to Japanese translations.
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 56d36be1db Improvements to Japanese translations.
56d36be1db is described below
commit 56d36be1db34a33527e9b66a9a59ccbeb95031de
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:48:16 2022 +
Improvements to Japanese translations.
Contributed by Shirayuking and tak7iji.
---
.../catalina/authenticator/LocalStrings_ja.properties | 2 +-
.../apache/catalina/connector/LocalStrings_ja.properties | 4 ++--
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 +-
.../org/apache/catalina/startup/LocalStrings_ja.properties | 14 +++---
java/org/apache/coyote/http2/LocalStrings_ja.properties| 2 +-
.../org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 4 ++--
.../org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4 ++--
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index d2fde48949..2201a85644 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました。
+authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index be929a3fa9..71f7546e18 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -49,7 +49,7 @@ coyoteRequest.filterAsyncSupportUnknown=非同期処理をサポートしてい
coyoteRequest.getContextPath.ise=標準的なコンテキストパス [{0}] とユーザーエージェント [{1}]
によって提示されたURIとの一致が見つかりません
coyoteRequest.getInputStream.ise=getReader()はこのリクエストに対して既に呼び出されています
coyoteRequest.getReader.ise=getInputStream()はこのリクエストに対して既に呼び出されています
-coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません。
+coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません
coyoteRequest.maxPostSizeExceeded=マルチパートリクエストには、関連付けられたコネクタで設定されたmaxPostSizeの制限を超えたパラメータデータ（アップロードされたファイルを除く）が含まれていました。
coyoteRequest.noAsync=処理チェーン内の次のクラスが非同期をサポートしていないため、非同期を開始できません。[{0}]
coyoteRequest.noMultipartConfig=multi-part 構成が提供されていないため、partを処理することができません
@@ -90,4 +90,4 @@ requestFacade.nullRequest=リクエストオブジェクトは回収されこの
response.illegalWrap=レスポンスラッパーは、getResponse()から取得したレスポンスをラップする必要があります。
response.sendRedirectFail=[{0}] へのリダイレクトが失敗しました。
-responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません。
+responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9eec4b282e..a2d04914af 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -125,7 +125,7 @@ containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
-defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
+defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません
defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy
メソッド [{0}] が見つかりません
defaultInstanceManager.restrictedClass=制限されたクラス [{0}]
へのアクセスは拒否されました。制限されたクラスを読み込むには Web アプリケーションに特権を構成しなければなりません。
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index b3e22f21fc..9a5fdeeed5 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -60,16 +60,16 @@ contextConfig.effectiveWebXml=有効なweb.xml：\n\
contextConfig.fileUrl=URL [{0}] のファイルオブジェクトを作成できません。
contextConfig.fixDocBase=コンテキスト [{0}] の docBase を修復中に例外が発生しました。
contextConfig.init=ContextConfig: 初期化中\n
-contextConfi
[tomcat] branch 10.1.x updated: Improvements to Japanese translations.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 272d0f2d6a Improvements to Japanese translations.
272d0f2d6a is described below
commit 272d0f2d6a705d029b54beab471fc5162961a284
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:48:16 2022 +
Improvements to Japanese translations.
Contributed by Shirayuking and tak7iji.
---
.../catalina/authenticator/LocalStrings_ja.properties | 2 +-
.../apache/catalina/connector/LocalStrings_ja.properties | 4 ++--
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 +-
.../org/apache/catalina/startup/LocalStrings_ja.properties | 14 +++---
java/org/apache/coyote/http2/LocalStrings_ja.properties| 2 +-
.../org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 4 ++--
.../org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
10 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index d2fde48949..2201a85644 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました。
+authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index be929a3fa9..71f7546e18 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -49,7 +49,7 @@ coyoteRequest.filterAsyncSupportUnknown=非同期処理をサポートしてい
coyoteRequest.getContextPath.ise=標準的なコンテキストパス [{0}] とユーザーエージェント [{1}]
によって提示されたURIとの一致が見つかりません
coyoteRequest.getInputStream.ise=getReader()はこのリクエストに対して既に呼び出されています
coyoteRequest.getReader.ise=getInputStream()はこのリクエストに対して既に呼び出されています
-coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません。
+coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません
coyoteRequest.maxPostSizeExceeded=マルチパートリクエストには、関連付けられたコネクタで設定されたmaxPostSizeの制限を超えたパラメータデータ（アップロードされたファイルを除く）が含まれていました。
coyoteRequest.noAsync=処理チェーン内の次のクラスが非同期をサポートしていないため、非同期を開始できません。[{0}]
coyoteRequest.noMultipartConfig=multi-part 構成が提供されていないため、partを処理することができません
@@ -90,4 +90,4 @@ requestFacade.nullRequest=リクエストオブジェクトは回収されこの
response.illegalWrap=レスポンスラッパーは、getResponse()から取得したレスポンスをラップする必要があります。
response.sendRedirectFail=[{0}] へのリダイレクトが失敗しました。
-responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません。
+responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9eec4b282e..a2d04914af 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -125,7 +125,7 @@ containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
-defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
+defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません
defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy
メソッド [{0}] が見つかりません
defaultInstanceManager.restrictedClass=制限されたクラス [{0}]
へのアクセスは拒否されました。制限されたクラスを読み込むには Web アプリケーションに特権を構成しなければなりません。
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index b3e22f21fc..9a5fdeeed5 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -60,16 +60,16 @@ contextConfig.effectiveWebXml=有効なweb.xml：\n\
contextConfig.fileUrl=URL [{0}] のファイルオブジェクトを作成できません。
contextConfig.fixDocBase=コンテキスト [{0}] の docBase を修復中に例外が発生しました。
contextConfig.init=ContextConfig: 初期化中\n
-contextC
[tomcat] branch 9.0.x updated: Improvements to Japanese translations.
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 52d3d5871d Improvements to Japanese translations.
52d3d5871d is described below
commit 52d3d5871d8088d8fc504b21c3523c9da8da795f
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:48:16 2022 +
Improvements to Japanese translations.
Contributed by Shirayuking and tak7iji.
---
.../catalina/authenticator/LocalStrings_ja.properties | 2 +-
.../apache/catalina/connector/LocalStrings_ja.properties | 4 ++--
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 +-
.../org/apache/catalina/startup/LocalStrings_ja.properties | 14 +++---
java/org/apache/coyote/http2/LocalStrings_ja.properties| 2 +-
.../org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 4 ++--
.../org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
10 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index d2fde48949..2201a85644 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました。
+authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 12611422e6..f48bc8f8ea 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -50,7 +50,7 @@ coyoteRequest.filterAsyncSupportUnknown=非同期処理をサポートしてい
coyoteRequest.getContextPath.ise=標準的なコンテキストパス [{0}] とユーザーエージェント [{1}]
によって提示されたURIとの一致が見つかりません
coyoteRequest.getInputStream.ise=getReader()はこのリクエストに対して既に呼び出されています
coyoteRequest.getReader.ise=getInputStream()はこのリクエストに対して既に呼び出されています
-coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません。
+coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません
coyoteRequest.maxPostSizeExceeded=マルチパートリクエストには、関連付けられたコネクタで設定されたmaxPostSizeの制限を超えたパラメータデータ（アップロードされたファイルを除く）が含まれていました。
coyoteRequest.noAsync=処理チェーン内の次のクラスが非同期をサポートしていないため、非同期を開始できません。[{0}]
coyoteRequest.noMultipartConfig=multi-part 構成が提供されていないため、partを処理することができません
@@ -91,4 +91,4 @@ requestFacade.nullRequest=リクエストオブジェクトは回収されこの
response.illegalWrap=レスポンスラッパーは、getResponse()から取得したレスポンスをラップする必要があります。
response.sendRedirectFail=[{0}] へのリダイレクトが失敗しました。
-responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません。
+responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index d94af15d17..2b161a450b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -127,7 +127,7 @@ containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
-defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
+defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません
defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy
メソッド [{0}] が見つかりません
defaultInstanceManager.restrictedClass=制限されたクラス [{0}]
へのアクセスは拒否されました。制限されたクラスを読み込むには Web アプリケーションに特権を構成しなければなりません。
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index ca22190ab4..25a2caf3a5 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -60,16 +60,16 @@ contextConfig.effectiveWebXml=有効なweb.xml：\n\
contextConfig.fileUrl=URL [{0}] のファイルオブジェクトを作成できません。
contextConfig.fixDocBase=コンテキスト [{0}] の docBase を修復中に例外が発生しました。
contextConfig.init=ContextConfig: 初期化中\n
-contextCon
[tomcat] branch 8.5.x updated: Improvements to Japanese translations.
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 27da40dc81 Improvements to Japanese translations.
27da40dc81 is described below
commit 27da40dc8189c456086fb4b4f07a18f16213830f
Author: Mark Thomas
AuthorDate: Wed Nov 30 17:48:16 2022 +
Improvements to Japanese translations.
Contributed by Shirayuking and tak7iji.
---
.../catalina/authenticator/LocalStrings_ja.properties | 2 +-
.../apache/catalina/connector/LocalStrings_ja.properties | 4 ++--
java/org/apache/catalina/core/LocalStrings_ja.properties | 2 +-
.../org/apache/catalina/startup/LocalStrings_ja.properties | 14 +++---
java/org/apache/coyote/http2/LocalStrings_ja.properties| 3 +--
.../org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 4 ++--
.../org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
.../tomcat/websocket/pojo/LocalStrings_ja.properties | 2 +-
webapps/docs/changelog.xml | 4
10 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index d2fde48949..2201a85644 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -20,7 +20,7 @@ authenticator.check.authorizeFail=Realm がユーザー[{0}]を認識しませ
authenticator.check.found=既に認証された [{0}]
authenticator.check.sso=認証されていませんが、SSOセッションID [{0}]が見つかりました。 再認証を試みます。
authenticator.formlogin=フォームログインページへの無効な直接参照です
-authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました。
+authenticator.jaspicCleanSubjectFail=JASPIC の cleanSubject が失敗しました
authenticator.jaspicSecureResponseFail=JASPIC処理中のsecure レスポンスに失敗しました
authenticator.jaspicServerAuthContextFail=JASPIC ServerAuthContext
インスタンスの取得に失敗しました
authenticator.loginFail=ログイン失敗
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 928de45abd..728e1523b8 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -50,7 +50,7 @@ coyoteRequest.filterAsyncSupportUnknown=非同期処理をサポートしてい
coyoteRequest.getContextPath.ise=標準的なコンテキストパス [{0}] とユーザーエージェント [{1}]
によって提示されたURIとの一致が見つかりません
coyoteRequest.getInputStream.ise=getReader()はこのリクエストに対して既に呼び出されています
coyoteRequest.getReader.ise=getInputStream()はこのリクエストに対して既に呼び出されています
-coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません。
+coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません
coyoteRequest.maxPostSizeExceeded=マルチパートリクエストには、関連付けられたコネクタで設定されたmaxPostSizeの制限を超えたパラメータデータ（アップロードされたファイルを除く）が含まれていました。
coyoteRequest.noAsync=処理チェーン内の次のクラスが非同期をサポートしていないため、非同期を開始できません。[{0}]
coyoteRequest.noMultipartConfig=multi-part 構成が提供されていないため、partを処理することができません
@@ -90,4 +90,4 @@ requestFacade.nullRequest=リクエストオブジェクトは回収されこの
response.illegalWrap=レスポンスラッパーは、getResponse()から取得したレスポンスをラップする必要があります。
response.sendRedirectFail=[{0}] へのリダイレクトが失敗しました。
-responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません。
+responseFacade.nullResponse=レスポンスオブジェクトはすでに回収されたためこのファサードとは関連付けがありません
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 6397d113f5..7e18ebaa53 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -128,7 +128,7 @@ containerBase.threadedStartFailed=子コンテナーを開始できません。
containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
defaultInstanceManager.invalidAnnotation=無効なアノテーション [{0}]
-defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです。
+defaultInstanceManager.invalidInjection=無効なメソッドリソースアノテーションです
defaultInstanceManager.postConstructNotFound=配備記述子に宣言されたクラス [{1}] の
post-construct メソッド [{0}] が見つかりません
defaultInstanceManager.preDestroyNotFound=配備記述子に宣言されたクラス [{1}] の pre-destroy
メソッド [{0}] が見つかりません
defaultInstanceManager.restrictedClass=制限されたクラス [{0}]
へのアクセスは拒否されました。制限されたクラスを読み込むには Web アプリケーションに特権を構成しなければなりません。
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index c7a934edb6..8592c6373a 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -48,16 +48,16 @@ contextConfig.destroy=ContextConfig：破棄中
contextConfig.fileUrl=URL [{0}] のファイルオブジェクトを作成できません。
contextConfig.fixDocBase=コンテキスト [{0}] の docBase を修復中に例外が発生しました。
contextConfig.init=ContextConfig: 初期化中\n
-contextConfig.
[tomcat] branch main updated: Update SpotBugs false positives after AsyncFileHandler refactoring
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 633acf1047 Update SpotBugs false positives after AsyncFileHandler refactoring 633acf1047 is described below commit 633acf1047401e5ee53f32f69738be6314849110 Author: Mark Thomas AuthorDate: Wed Nov 30 18:17:25 2022 + Update SpotBugs false positives after AsyncFileHandler refactoring --- res/spotbugs/filter-false-positives.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index ef68d4b4bb..b2710b9dca 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1100,9 +1100,15 @@ + + + + + + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update SpotBugs false positives after AsyncFileHandler refactoring
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new bc35df0f80 Update SpotBugs false positives after AsyncFileHandler refactoring bc35df0f80 is described below commit bc35df0f8014951666bac8bc9d67d5b5942cfda1 Author: Mark Thomas AuthorDate: Wed Nov 30 18:17:25 2022 + Update SpotBugs false positives after AsyncFileHandler refactoring --- res/spotbugs/filter-false-positives.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index ef68d4b4bb..b2710b9dca 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1100,9 +1100,15 @@ + + + + + + - + - 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: Update SpotBugs false positives after AsyncFileHandler refactoring
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 aea819cc6f Update SpotBugs false positives after AsyncFileHandler refactoring aea819cc6f is described below commit aea819cc6f5b273aa7fd5964dd80d5dae5fbd4cc Author: Mark Thomas AuthorDate: Wed Nov 30 18:17:25 2022 + Update SpotBugs false positives after AsyncFileHandler refactoring --- res/spotbugs/filter-false-positives.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 3021a10956..fb5877ef72 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1162,9 +1162,15 @@ + + + + + + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update SpotBugs false positives after AsyncFileHandler refactoring
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 0d727f1b772c9ca7bda069958512da32b48d4831 Author: Mark Thomas AuthorDate: Wed Nov 30 18:17:25 2022 + Update SpotBugs false positives after AsyncFileHandler refactoring --- res/spotbugs/filter-false-positives.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index ece55e90cc..991374f557 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1130,9 +1130,15 @@ + + + + + + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update false positives
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 1f89e6ba32591847c5006678ba47c31328e65e9f Author: Mark Thomas AuthorDate: Wed Nov 30 18:33:56 2022 + Update false positives --- res/spotbugs/filter-false-positives.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 991374f557..8405047bc8 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -902,6 +902,12 @@ + + + + + + @@ -1295,6 +1301,11 @@ + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (27da40dc81 -> 1f89e6ba32)
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 27da40dc81 Improvements to Japanese translations. new 0d727f1b77 Update SpotBugs false positives after AsyncFileHandler refactoring new 1f89e6ba32 Update false positives 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: res/spotbugs/filter-false-positives.xml | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 11.0.0-M1
Hi all, Just a heads up that, barring any last minute surprises, I intend to tag 11.0.0-M1 tomorrow. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 11.0.0-M1
On Wed, Nov 30, 2022 at 9:42 PM Mark Thomas wrote: > > Hi all, > > Just a heads up that, barring any last minute surprises, I intend to tag > 11.0.0-M1 tomorrow. +1 I thought there was not much, but actually there's the packaging bug 66348. Rémy > 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
