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 2020/04/20 09:42:24 UTC

[tomcat] branch master updated (66468c8 -> 6a313e9)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 66468c8  Add missing closing tag
     new 001104b  Refactor to allow removal of Constants class
     new 6a313e9  Remove deprecated code

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:
 java/org/apache/catalina/servlets/Constants.java   | 27 ----------------------
 .../apache/catalina/servlets/DefaultServlet.java   |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 java/org/apache/catalina/servlets/Constants.java


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/02: Remove deprecated code

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6a313e99d4b46c8b8d5193c3112b440f3fac8e7f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 20 10:36:25 2020 +0100

    Remove deprecated code
---
 java/org/apache/catalina/servlets/Constants.java | 30 ------------------------
 1 file changed, 30 deletions(-)

diff --git a/java/org/apache/catalina/servlets/Constants.java b/java/org/apache/catalina/servlets/Constants.java
deleted file mode 100644
index a40e96c..0000000
--- a/java/org/apache/catalina/servlets/Constants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-
-package org.apache.catalina.servlets;
-
-/**
- * Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public class Constants {
-
-    public static final String Package = "org.apache.catalina.servlets";
-
-}
-


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/02: Refactor to allow removal of Constants class

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 001104b731c6c3df30d0cbf70b3d305e2f736f46
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 20 10:36:10 2020 +0100

    Refactor to allow removal of Constants class
---
 java/org/apache/catalina/servlets/Constants.java      | 5 ++++-
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/Constants.java b/java/org/apache/catalina/servlets/Constants.java
index 52f4bdc..a40e96c 100644
--- a/java/org/apache/catalina/servlets/Constants.java
+++ b/java/org/apache/catalina/servlets/Constants.java
@@ -18,7 +18,10 @@
 
 package org.apache.catalina.servlets;
 
-
+/**
+ * Unused. Will be removed in Tomcat 10.
+ */
+@Deprecated
 public class Constants {
 
     public static final String Package = "org.apache.catalina.servlets";
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 5ee7724..d0bb994 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -141,7 +141,7 @@ public class DefaultServlet extends HttpServlet {
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(DefaultServlet.class);
 
     private static final DocumentBuilderFactory factory;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org