tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1043402 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocolHandler.java LocalStrings.properties
Date Wed, 08 Dec 2010 13:10:35 GMT
Author: markt
Date: Wed Dec  8 13:10:34 2010
New Revision: 1043402

URL: http://svn.apache.org/viewvc?rev=1043402&view=rev
Log:
Nice idea, but need i18n for the actions so each needs its own string

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
    tomcat/trunk/java/org/apache/coyote/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1043402&r1=1043401&r2=1043402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Wed Dec  8 13:10:34 2010
@@ -345,13 +345,13 @@ public abstract class AbstractProtocolHa
     @Override
     public final void pause() throws Exception {
         if(getLog().isInfoEnabled())
-            getLog().info(sm.getString("abstractProtocolHandler.action",
-                    "Pausing", getName()));
+            getLog().info(sm.getString("abstractProtocolHandler.pause",
+                    getName()));
         try {
             endpoint.pause();
         } catch (Exception ex) {
-            getLog().error(sm.getString("abstractProtocolHandler.actionError",
-                    "pause", getName()), ex);
+            getLog().error(sm.getString("abstractProtocolHandler.pauseError",
+                    getName()), ex);
             throw ex;
         }
     }
@@ -359,13 +359,13 @@ public abstract class AbstractProtocolHa
     @Override
     public final void resume() throws Exception {
         if(getLog().isInfoEnabled())
-            getLog().info(sm.getString("abstractProtocolHandler.action",
-                    "Resuming", getName()));
+            getLog().info(sm.getString("abstractProtocolHandler.resume",
+                    getName()));
         try {
             endpoint.resume();
         } catch (Exception ex) {
-            getLog().error(sm.getString("abstractProtocolHandler.actionError",
-                    "resume", getName()), ex);
+            getLog().error(sm.getString("abstractProtocolHandler.resumeError",
+                    getName()), ex);
             throw ex;
         }
     }
@@ -376,27 +376,27 @@ public abstract class AbstractProtocolHa
         try {
             endpoint.stop();
         } catch (Exception ex) {
-            getLog().error(sm.getString("abstractProtocolHandler.action",
-                    "Stopping"), ex);
+            getLog().error(sm.getString("abstractProtocolHandler.stop",
+                    getName()), ex);
             throw ex;
         }
         if(getLog().isInfoEnabled())
-            getLog().info(sm.getString("abstractProtocolHandler.actionError",
-                    "stop", getName()));
+            getLog().info(sm.getString("abstractProtocolHandler.stopError",
+                    getName()));
     }
 
 
     @Override
     public final void destroy() {
         if(getLog().isInfoEnabled()) {
-            getLog().info(sm.getString("abstractProtocolHandler.action",
-                    "Destroying", getName()));
+            getLog().info(sm.getString("abstractProtocolHandler.destroy",
+                    getName()));
         }
         try {
             endpoint.destroy();
         } catch (Exception e) {
-            getLog().error(sm.getString("abstractProtocolHandler.actionError",
-                    "destroy", getName()), e);
+            getLog().error(sm.getString("abstractProtocolHandler.destroyError",
+                    getName()), e);
         }
         
         if( tpOname!=null )

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1043402&r1=1043401&r2=1043402&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Wed Dec  8 13:10:34 2010
@@ -13,9 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-abstractProtocolHandler.action={0} ProtocolHandler [{1}]
-abstractProtocolHandler.actionError=Failed to {0} end point associated with ProtocolHandler
[{1}]
 abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
 abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
+abstractProtocolHandler.pause=Pausing ProtocolHandler [{0}]
+abstractProtocolHandler.pauseError=Failed to pause end point associated with ProtocolHandler
[{0}]
+abstractProtocolHandler.resume=Resuming ProtocolHandler [{0}]
+abstractProtocolHandler.resumeError=Failed to resume end point associated with ProtocolHandler
[{0}]
+abstractProtocolHandler.stop=Stopping ProtocolHandler [{0}]
+abstractProtocolHandler.stopError=Failed to stop end point associated with ProtocolHandler
[{0}]
+abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
+abstractProtocolHandler.destroyError=Failed to destroy end point associated with ProtocolHandler
[{0}]
 
 asyncStateMachine.invalidAsyncState=Calling [{0}] is not valid for a request with Async state
[{1}]



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


Mime
View raw message